Merge pull request #393 from contagnas/master

benradf · web-flow · commit db8ad396d3c3 · 2023-08-04T11:54:04.000+01:00
Update rust toolchain to use rules_rust 0.22.0
diff --git a/examples/toolchains/rust/WORKSPACE b/examples/toolchains/rust/WORKSPACE
@@ -9,12 +9,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # https://bazelbuild.github.io/rules_rust/#setup
 http_archive(
     name = "rules_rust",
-    sha256 = "d125fb75432dc3b20e9b5a19347b45ec607fabe75f98c6c4ba9badaab9c193ce",
+    sha256 = "50272c39f20a3a3507cb56dcb5c3b348bda697a7d868708449e2fa6fb893444c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
-        "https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
+        "https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
     ],
-    # rules_rust 0.17.0 does not yet support direct
+    # rules_rust 0.22.0 does not yet support direct
     # overriding toolchain used for build of cargo-bazel
     # binary.
     # On non-standard systems (viz. NixOS), that approach
diff --git a/examples/toolchains/rust/cargo-bazel-lock.json b/examples/toolchains/rust/cargo-bazel-lock.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "59ace66e05f26b5ab71bdc99a930d8b1bafdb232f70f60ad13c15599bc4a49a4",
+  "checksum": "7b9ecdeb4604da8a08e5bb7a2db2abcb1193b450993102bce9e408287cbb0a89",
   "crates": {
     "autocfg 1.1.0": {
       "name": "autocfg",
@@ -56,9 +56,12 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "default"
-        ],
+        "crate_features": {
+          "common": [
+            "default"
+          ],
+          "selects": {}
+        },
         "edition": "2018",
         "version": "1.3.2"
       },
@@ -261,10 +264,13 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "default",
-          "std"
-        ],
+        "crate_features": {
+          "common": [
+            "default",
+            "std"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
@@ -309,12 +315,15 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "alloc",
-          "default",
-          "race",
-          "std"
-        ],
+        "crate_features": {
+          "common": [
+            "alloc",
+            "default",
+            "race",
+            "std"
+          ],
+          "selects": {}
+        },
         "edition": "2021",
         "version": "1.17.0"
       },
@@ -354,9 +363,12 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "default"
-        ],
+        "crate_features": {
+          "common": [
+            "default"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
@@ -637,10 +649,13 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "default",
-          "proc-macro"
-        ],
+        "crate_features": {
+          "common": [
+            "default",
+            "proc-macro"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
@@ -698,10 +713,13 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "default",
-          "proc-macro"
-        ],
+        "crate_features": {
+          "common": [
+            "default",
+            "proc-macro"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
@@ -759,16 +777,19 @@
         "compile_data_glob": [
           "**"
         ],
-        "crate_features": [
-          "clone-impls",
-          "default",
-          "derive",
-          "full",
-          "parsing",
-          "printing",
-          "proc-macro",
-          "quote"
-        ],
+        "crate_features": {
+          "common": [
+            "clone-impls",
+            "default",
+            "derive",
+            "full",
+            "parsing",
+            "printing",
+            "proc-macro",
+            "quote"
+          ],
+          "selects": {}
+        },
         "deps": {
           "common": [
             {
diff --git a/registry/modules/rules_rust/0.22.0/MODULE.bazel b/registry/modules/rules_rust/0.22.0/MODULE.bazel
@@ -1,6 +1,6 @@
 module(
     name = "rules_rust",
-    version = "0.17.0",
+    version = "0.22.0",
 )
 
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
diff --git a/registry/modules/rules_rust/0.22.0/patches/001-rules-rust-crate-universe.patch b/registry/modules/rules_rust/0.22.0/patches/001-rules-rust-crate-universe.patch
diff --git a/registry/modules/rules_rust/0.22.0/patches/bzlmod-compat.patch b/registry/modules/rules_rust/0.22.0/patches/bzlmod-compat.patch
diff --git a/registry/modules/rules_rust/0.22.0/source.json b/registry/modules/rules_rust/0.22.0/source.json
@@ -1,6 +1,6 @@
 {
-  "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
-  "integrity": "sha384-v3eVoRi4rdkELxzV3egjTJkc8M3UH1YmbdZ2m6Y45gpjBew4a/JU5A4TFNO8Bq3z",
+  "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
+  "integrity": "sha384-9HMDzRK4uOv9zg4qyT8rctHUhNfvm9bztPMH9SPjMeu/NJbK7SaI9NU0WRg0S+ny",
   "patches": {
     "001-rules-rust-crate-universe.patch": "sha384-3jCxEdq9CtWHQZWbIj3vvI1MDxc735phBmjj49QbnRCuIVFjMfMQRH7x6px4iKT4",
     "bzlmod-compat.patch": "sha384-N2llBj7w8Y9bTSuXEhuFYxt3eJ6IZpFKP+fOG2t37WilVocXjBVvarolapFJhzU5"
diff --git a/registry/modules/rules_rust/metadata.json b/registry/modules/rules_rust/metadata.json
@@ -1,6 +1,6 @@
 {
   "homepage": "https://bazelbuild.github.io/rules_rust/",
   "maintainers": [],
-  "versions": ["0.17.0"],
+  "versions": ["0.22.0"],
   "yanked_versions": []
 }
diff --git a/testing/rust/MODULE.bazel b/testing/rust/MODULE.bazel
@@ -26,7 +26,7 @@ local_path_override(
 
 bazel_dep(name = "bazel_skylib", version = "1.0.3")
 bazel_dep(name = "rules_cc", version = "0.0.4")
-bazel_dep(name = "rules_rust", version = "0.17.0")
+bazel_dep(name = "rules_rust", version = "0.22.0")
 
 # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has
 #   become a module extension in rules_nixpkgs_java.
diff --git a/testing/rust/WORKSPACE b/testing/rust/WORKSPACE
@@ -37,10 +37,10 @@ bazel_skylib_workspace()
 
 http_archive(
     name = "rules_rust",
-    sha256 = "d125fb75432dc3b20e9b5a19347b45ec607fabe75f98c6c4ba9badaab9c193ce",
+    sha256 = "50272c39f20a3a3507cb56dcb5c3b348bda697a7d868708449e2fa6fb893444c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
-        "https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
+        "https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
     ],
     # See note on examples/toolchains/rust/WORKSPACE.
     patches = ["//:patches/001-rules-rust-crate-universe.patch"],
diff --git a/toolchains/rust/MODULE.bazel b/toolchains/rust/MODULE.bazel
@@ -9,4 +9,4 @@ bazel_dep(name = "bazel_skylib", version = "1.0.3")
 # local registry entry to map a commit to a module "version". the caller will
 # also have to know this and point `--registry` at the file from right revision
 # on GitHub!
-bazel_dep(name = "rules_rust", version = "0.17.0")
+bazel_dep(name = "rules_rust", version = "0.22.0")
diff --git a/toolchains/rust/rust.bzl b/toolchains/rust/rust.bzl
@@ -107,7 +107,6 @@ pkgs.buildEnv {{
             binary_ext = "${{binary-ext}}",
             staticlib_ext = "${{staticlib-ext}}",
             dylib_ext = "${{dylib-ext}}",
-            os = "${{os}}",
             exec_triple = "${{build-triple}}",
             target_triple = "${{target-triple}}",
             default_edition = "{default_edition}",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`module(`
`2`	`2`	`name = "rules_rust",`
`3`		`- version = "0.17.0",`
	`3`	`+ version = "0.22.0",`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`bazel_dep(name = "bazel_skylib", version = "1.0.3")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",`
`3`		`- "integrity": "sha384-v3eVoRi4rdkELxzV3egjTJkc8M3UH1YmbdZ2m6Y45gpjBew4a/JU5A4TFNO8Bq3z",`
	`2`	`+ "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",`
	`3`	`+ "integrity": "sha384-9HMDzRK4uOv9zg4qyT8rctHUhNfvm9bztPMH9SPjMeu/NJbK7SaI9NU0WRg0S+ny",`
`4`	`4`	`"patches": {`
`5`	`5`	`"001-rules-rust-crate-universe.patch": "sha384-3jCxEdq9CtWHQZWbIj3vvI1MDxc735phBmjj49QbnRCuIVFjMfMQRH7x6px4iKT4",`
`6`	`6`	`"bzlmod-compat.patch": "sha384-N2llBj7w8Y9bTSuXEhuFYxt3eJ6IZpFKP+fOG2t37WilVocXjBVvarolapFJhzU5"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"homepage": "https://bazelbuild.github.io/rules_rust/",`
`3`	`3`	`"maintainers": [],`
`4`		`- "versions": ["0.17.0"],`
	`4`	`+ "versions": ["0.22.0"],`
`5`	`5`	`"yanked_versions": []`
`6`	`6`	`}`