git.delta.rocks / jrsonnet / refs/commits / 1f5d87f33b16

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
-package.version = "0.5.0"
+package.version = "0.5.0-pre6"
 members = ["crates/*", "bindings/jsonnet", "cmds/jrsonnet", "tests"]
 default-members = ["cmds/jrsonnet"]
 
 [workspace.dependencies]
-jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0" }
-jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0" }
-jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0" }
-jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0" }
-jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0" }
-jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0" }
-jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0" }
+jrsonnet-evaluator = { path = "./crates/jrsonnet-evaluator", version = "0.5.0-pre6" }
+jrsonnet-macros = { path = "./crates/jrsonnet-macros", version = "0.5.0-pre6" }
+jrsonnet-parser = { path = "./crates/jrsonnet-parser", version = "0.5.0-pre6" }
+jrsonnet-interner = { path = "./crates/jrsonnet-interner", version = "0.5.0-pre6" }
+jrsonnet-stdlib = { path = "./crates/jrsonnet-stdlib", version = "0.5.0-pre6" }
+jrsonnet-cli = { path = "./crates/jrsonnet-cli", version = "0.5.0-pre6" }
+jrsonnet-types = { path = "./crates/jrsonnet-types", version = "0.5.0-pre6" }
 
 [profile.test]
 opt-level = 1

--- a/crates/jrsonnet-evaluator/Cargo.toml
+++ b/crates/jrsonnet-evaluator/Cargo.toml
@@ -36,7 +36,7 @@
 jrsonnet-gcmodule = { version = "0.3.4" }
 
 pathdiff = "0.2.1"
-hashbrown = "0.13.1"
+hashbrown = "0.13.2"
 static_assertions = "1.1"
 
 rustc-hash = "1.1"
@@ -53,4 +53,4 @@
 # Explaining traces
 annotate-snippets = { version = "0.9.1", features = ["color"], optional = true }
 # Async imports
-async-trait = { version = "0.1.59", optional = true }
+async-trait = { version = "0.1.60", optional = true }

--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -125,9 +125,21 @@
 		let from = from.unwrap_or(0);
 		let to = to.unwrap_or(len).min(len);
 		let step = step.unwrap_or(1);
+
 		if from >= to || step == 0 {
 			return None;
 		}
+		// match self {
+		// 	ArrValue::Slice(slice) => {
+		// 		return Some(Self::Slice(Cc::new(SliceArray {
+		// 			inner: slice.inner.clone(),
+		// 			from: slice.from + slice.step * (from as u32),
+		// 			to: slice.from + (to as u32) * slice.step,
+		// 			step: slice.step * step as u32,
+		// 		})))
+		// 	}
+		// 	_ => {}
+		// }
 
 		Some(Self::Slice(Cc::new(SliceArray {
 			inner: self,

--- a/crates/jrsonnet-interner/Cargo.toml
+++ b/crates/jrsonnet-interner/Cargo.toml
@@ -22,4 +22,4 @@
 structdump = { version = "0.2.0", optional = true }
 
 rustc-hash = "1.1"
-hashbrown = { version = "0.13.1", features = ["inline-more"] }
+hashbrown = { version = "0.13.2", features = ["inline-more"] }

--- a/crates/jrsonnet-macros/Cargo.toml
+++ b/crates/jrsonnet-macros/Cargo.toml
@@ -1,5 +1,8 @@
 [package]
 name = "jrsonnet-macros"
+description = "Macros to reduce boilerplate in jrsonnet-evaluator usage"
+authors = ["Yaroslav Bolyukin <iam@lach.pw>"]
+license = "MIT"
 version.workspace = true
 edition = "2021"
 

--- a/crates/jrsonnet-parser/Cargo.toml
+++ b/crates/jrsonnet-parser/Cargo.toml
@@ -31,7 +31,7 @@
 
 static_assertions = "1.1"
 
-peg = "0.8.0"
+peg = "0.8.1"
 
 serde = { version = "1.0", features = ["derive", "rc"], optional = true }
 structdump = { version = "0.2.0", features = ["derive"], optional = true }

--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -31,7 +31,7 @@
 # std.md5
 md5 = "0.7.0"
 # std.base64
-base64 = "0.13.1"
+base64 = "0.21.0"
 # std.parseJson
 serde_json = "1.0"
 # std.parseYaml, custom library fork is used for C++/golang compatibility

--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1670089411,
-        "narHash": "sha256-iiW+L7iN8At8s98qb2h1P8Z0BVTZLqY8KHpfZuM7ULQ=",
+        "lastModified": 1673199114,
+        "narHash": "sha256-8y6ZacZfnBoBBQWcnncqAKHhONFqrfEsqol0oU7KRRs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ffa4eb958a435e9833bda0fdfc834e87232aa879",
+        "rev": "87ebf1654e1f1345b8abfb5c4410e3671208d3be",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1670034122,
-        "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
+        "lastModified": 1673144952,
+        "narHash": "sha256-FqSkt+4BP1562dCeN3FoWEXzQ74+9yVeMnypNyC4aYk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
+        "rev": "07c10018a48b637d9864030468679adaeb18ab95",
         "type": "github"
       },
       "original": {

--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
           inherit system;
           overlays = [ rust-overlay.overlays.default ];
         };
-        rust = ((pkgs.rustChannelOf { date = "2022-11-19"; channel = "nightly"; }).default.override {
+        rust = ((pkgs.rustChannelOf { date = "2023-01-06"; channel = "nightly"; }).default.override {
           extensions = [ "rust-src" "miri" ];
         });
       in