Fix rules_rust_prost repo cache issues

dzbarsky · dzbarsky · commit 4149ab6874fe · 2026-04-09T11:43:17.000-04:00
diff --git a/rs/experimental/rules_rust.bzl b/rs/experimental/rules_rust.bzl
@@ -31,9 +31,9 @@ def _rules_rust_impl(mctx):
 
     http_archive(
         name = "rules_rust",
-        integrity = "sha256-vZfWz/bMaLs3Q/xRtj0qEVqQa47Xwd2iK6GgYJZqgUU=",
-        strip_prefix = "rules_rust-e1ed0e436cb319700887823c7df421c5684bc6da",
-        url = "https://github.com/hermeticbuild/rules_rust/archive/e1ed0e436cb319700887823c7df421c5684bc6da.tar.gz",
+        integrity = "sha256-A3y+v1265snByz0FYfvBcijUfG30TGkuZByXIvZcmHU=",
+        strip_prefix = "rules_rust-496f7a482ce8be997d7e6ebc79c1b7c30152297a",
+        url = "https://github.com/hermeticbuild/rules_rust/archive/496f7a482ce8be997d7e6ebc79c1b7c30152297a.tar.gz",
         patches = patches,
         patch_strip = strip,
     )
diff --git a/rs/experimental/rules_rust_prost.bzl b/rs/experimental/rules_rust_prost.bzl
@@ -75,9 +75,12 @@ _rules_rust_prost_repo = repository_rule(
 )
 
 def _rules_rust_prost_impl(mctx):
+    prost_workspace = mctx.path(Label("@rules_rust//:extensions/prost/WORKSPACE.bzlmod"))
+    mctx.read(prost_workspace)
+
     local_repository(
         name = "rules_rust_prost_upstream",
-        path = str(mctx.path(Label("@rules_rust//:extensions/prost/WORKSPACE.bzlmod")).dirname),
+        path = str(prost_workspace.dirname),
     )
 
     _rules_rust_prost_repo(
diff --git a/test/MODULE.bazel.lock b/test/MODULE.bazel.lock

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,12 @@ _rules_rust_prost_repo = repository_rule(`
`75`	`75`	`)`
`76`	`76`
`77`	`77`	`def _rules_rust_prost_impl(mctx):`
	`78`	`+ prost_workspace = mctx.path(Label("@rules_rust//:extensions/prost/WORKSPACE.bzlmod"))`
	`79`	`+ mctx.read(prost_workspace)`
	`80`	`+`
`78`	`81`	`local_repository(`
`79`	`82`	`name = "rules_rust_prost_upstream",`
`80`		`- path = str(mctx.path(Label("@rules_rust//:extensions/prost/WORKSPACE.bzlmod")).dirname),`
	`83`	`+ path = str(prost_workspace.dirname),`
`81`	`84`	`)`
`82`	`85`
`83`	`86`	`_rules_rust_prost_repo(`