about summary refs log tree commit diff
path: root/tvix
diff options
context:
space:
mode:
Diffstat (limited to 'tvix')
-rw-r--r--tvix/Cargo.lock49
-rw-r--r--tvix/Cargo.nix126
-rw-r--r--tvix/castore/Cargo.toml2
-rw-r--r--tvix/cli/Cargo.toml2
-rw-r--r--tvix/glue/Cargo.toml2
-rw-r--r--tvix/nix-compat/Cargo.toml2
-rw-r--r--tvix/store/Cargo.toml2
7 files changed, 67 insertions, 118 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 8a12ab6726b8..32833e7cc1a4 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -1928,30 +1928,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2 1.0.67",
- "quote 1.0.33",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2 1.0.67",
- "quote 1.0.33",
- "version_check",
-]
-
-[[package]]
 name = "proc-macro2"
 version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2817,24 +2793,35 @@ dependencies = [
 
 [[package]]
 name = "test-case"
-version = "2.2.2"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0"
+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
 dependencies = [
  "test-case-macros",
 ]
 
 [[package]]
-name = "test-case-macros"
-version = "2.2.2"
+name = "test-case-core"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26"
+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
 dependencies = [
  "cfg-if",
- "proc-macro-error",
  "proc-macro2 1.0.67",
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.39",
+]
+
+[[package]]
+name = "test-case-macros"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
+dependencies = [
+ "proc-macro2 1.0.67",
+ "quote 1.0.33",
+ "syn 2.0.39",
+ "test-case-core",
 ]
 
 [[package]]
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 1ad3422d3094..6392a1f020b6 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -5742,74 +5742,6 @@ rec {
           "verbatim" = [ "syn/parsing" ];
         };
       };
-      "proc-macro-error" = rec {
-        crateName = "proc-macro-error";
-        version = "1.0.4";
-        edition = "2018";
-        sha256 = "1373bhxaf0pagd8zkyd03kkx6bchzf6g0dkwrwzsnal9z47lj9fs";
-        authors = [
-          "CreepySkeleton <creepy-skeleton@yandex.ru>"
-        ];
-        dependencies = [
-          {
-            name = "proc-macro-error-attr";
-            packageId = "proc-macro-error-attr";
-          }
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2 1.0.67";
-          }
-          {
-            name = "quote";
-            packageId = "quote 1.0.33";
-          }
-          {
-            name = "syn";
-            packageId = "syn 1.0.109";
-            optional = true;
-            usesDefaultFeatures = false;
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "version_check";
-            packageId = "version_check";
-          }
-        ];
-        features = {
-          "default" = [ "syn-error" ];
-          "syn" = [ "dep:syn" ];
-          "syn-error" = [ "syn" ];
-        };
-        resolvedDefaultFeatures = [ "default" "syn" "syn-error" ];
-      };
-      "proc-macro-error-attr" = rec {
-        crateName = "proc-macro-error-attr";
-        version = "1.0.4";
-        edition = "2018";
-        sha256 = "0sgq6m5jfmasmwwy8x4mjygx5l7kp8s4j60bv25ckv2j1qc41gm1";
-        procMacro = true;
-        authors = [
-          "CreepySkeleton <creepy-skeleton@yandex.ru>"
-        ];
-        dependencies = [
-          {
-            name = "proc-macro2";
-            packageId = "proc-macro2 1.0.67";
-          }
-          {
-            name = "quote";
-            packageId = "quote 1.0.33";
-          }
-        ];
-        buildDependencies = [
-          {
-            name = "version_check";
-            packageId = "version_check";
-          }
-        ];
-
-      };
       "proc-macro2 0.4.30" = rec {
         crateName = "proc-macro2";
         version = "0.4.30";
@@ -8541,9 +8473,9 @@ rec {
       };
       "test-case" = rec {
         crateName = "test-case";
-        version = "2.2.2";
-        edition = "2018";
-        sha256 = "1h4qymhy332lzgg79w696qfxg6wdab5birn8xvfgkczzgmdczmi1";
+        version = "3.3.1";
+        edition = "2021";
+        sha256 = "1a380yzm6787737cw7s09jqmkn9035hghahradl2ikdg2gfm09gb";
         authors = [
           "Marcin Sas-Szymanski <marcin.sas-szymanski@anixe.pl>"
           "Wojciech Polak <frondeus@gmail.com>"
@@ -8561,12 +8493,11 @@ rec {
           "with-regex" = [ "regex" "test-case-macros/with-regex" ];
         };
       };
-      "test-case-macros" = rec {
-        crateName = "test-case-macros";
-        version = "2.2.2";
-        edition = "2018";
-        sha256 = "09jvbfvz48v6ya3i25gp3lbr6ym1fz7qyp3l6bcdslwkw7v7nnz4";
-        procMacro = true;
+      "test-case-core" = rec {
+        crateName = "test-case-core";
+        version = "3.3.1";
+        edition = "2021";
+        sha256 = "0krqi0gbi1yyycigyjlak63r8h1n0vms7mg3kckqwlfd87c7zjxd";
         authors = [
           "Marcin Sas-Szymanski <marcin.sas-szymanski@anixe.pl>"
           "Wojciech Polak <frondeus@gmail.com>"
@@ -8578,10 +8509,6 @@ rec {
             packageId = "cfg-if";
           }
           {
-            name = "proc-macro-error";
-            packageId = "proc-macro-error";
-          }
-          {
             name = "proc-macro2";
             packageId = "proc-macro2 1.0.67";
           }
@@ -8591,12 +8518,47 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 1.0.109";
+            packageId = "syn 2.0.39";
             features = [ "full" "extra-traits" ];
           }
         ];
         features = { };
       };
+      "test-case-macros" = rec {
+        crateName = "test-case-macros";
+        version = "3.3.1";
+        edition = "2021";
+        sha256 = "1yvgky3qax73bic6m368q04xc955p4a91mddd6b5fk7d04mfg2aw";
+        procMacro = true;
+        authors = [
+          "Marcin Sas-Szymanski <marcin.sas-szymanski@anixe.pl>"
+          "Wojciech Polak <frondeus@gmail.com>"
+          "Łukasz Biel <lukasz.p.biel@gmail.com>"
+        ];
+        dependencies = [
+          {
+            name = "proc-macro2";
+            packageId = "proc-macro2 1.0.67";
+          }
+          {
+            name = "quote";
+            packageId = "quote 1.0.33";
+          }
+          {
+            name = "syn";
+            packageId = "syn 2.0.39";
+            features = [ "full" "extra-traits" "parsing" ];
+          }
+          {
+            name = "test-case-core";
+            packageId = "test-case-core";
+            usesDefaultFeatures = false;
+          }
+        ];
+        features = {
+          "with-regex" = [ "test-case-core/with-regex" ];
+        };
+      };
       "test-generator" = rec {
         crateName = "test-generator";
         version = "0.3.0";
diff --git a/tvix/castore/Cargo.toml b/tvix/castore/Cargo.toml
index 99c7d96e886d..584e64adb8ec 100644
--- a/tvix/castore/Cargo.toml
+++ b/tvix/castore/Cargo.toml
@@ -67,7 +67,7 @@ prost-build = "0.12.1"
 tonic-build = "0.10.2"
 
 [dev-dependencies]
-test-case = "2.2.2"
+test-case = "3.3.1"
 tempfile = "3.3.0"
 tokio-retry = "0.3.0"
 hex-literal = "0.4.1"
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml
index 7a27c148f45d..a9bdba254f30 100644
--- a/tvix/cli/Cargo.toml
+++ b/tvix/cli/Cargo.toml
@@ -25,4 +25,4 @@ tokio = "1.28.0"
 git = "https://github.com/tvlfyi/wu-manber.git"
 
 [dev-dependencies]
-test-case = "2.2.2"
+test-case = "3.3.1"
diff --git a/tvix/glue/Cargo.toml b/tvix/glue/Cargo.toml
index 80a7d1b63f96..ad776a48f730 100644
--- a/tvix/glue/Cargo.toml
+++ b/tvix/glue/Cargo.toml
@@ -23,7 +23,7 @@ git = "https://github.com/tvlfyi/wu-manber.git"
 criterion = { version = "0.5", features = ["html_reports"] }
 lazy_static = "1.4.0"
 tempfile = "3.8.1"
-test-case = "2.2.2"
+test-case = "3.3.1"
 
 [[bench]]
 name = "eval"
diff --git a/tvix/nix-compat/Cargo.toml b/tvix/nix-compat/Cargo.toml
index 8e945cc4ee46..2e4bff71aa42 100644
--- a/tvix/nix-compat/Cargo.toml
+++ b/tvix/nix-compat/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.38"
 futures = { version = "0.3.30", default-features = false, features = ["executor"] }
 lazy_static = "1.4.0"
 serde_json = "1.0"
-test-case = "2.2.2"
+test-case = "3.3.1"
 criterion = { version = "0.5", features = ["html_reports"] }
 hex-literal = "0.4.1"
 pretty_assertions = "1.4.0"
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 39bd0851bc54..9065465af622 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -47,7 +47,7 @@ prost-build = "0.12.1"
 tonic-build = "0.10.2"
 
 [dev-dependencies]
-test-case = "2.2.2"
+test-case = "3.3.1"
 tempfile = "3.3.0"
 tokio-retry = "0.3.0"
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-02T22·17+0000