Skip to content

Move module_ctx.watch to after lockfile repin #3932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrickmscott wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −12
Open

Move module_ctx.watch to after lockfile repin #3932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eebf21e
Move module_ctx.watch to after lockfile repin
patrickmscott Mar 26, 2026
7fa0c7e
Merge branch 'main' into patrick/bazel9
patrickmscott Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions crate_universe/extensions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,18 +1112,6 @@ def _crate_impl(module_ctx):
fail("Spec specified for repo {}, but the module defined repositories {}".format(repo, local_repos))

for cfg in mod.tags.from_cargo + mod.tags.from_specs:
# Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation
# function of the module extension when the file has changed.
if cfg.cargo_lockfile:
module_ctx.watch(cfg.cargo_lockfile)
if cfg.lockfile:
module_ctx.watch(cfg.lockfile)
if cfg.cargo_config:
module_ctx.watch(cfg.cargo_config)
if hasattr(cfg, "manifests"):
for m in cfg.manifests:
module_ctx.watch(m)

cargo_path, rustc_path = _get_host_cargo_rustc(module_ctx, host_triple, cfg.host_tools)
cargo_bazel_fn = new_cargo_bazel_fn(
repository_ctx = module_ctx,
Expand Down Expand Up @@ -1180,6 +1168,19 @@ def _crate_impl(module_ctx):
strip_internal_dependencies_from_cargo_lockfile = cfg.strip_internal_dependencies_from_cargo_lockfile,
)

# Preload all external repositories. Calling `module_ctx.watch` will cause restarts of the implementation
# function of the module extension when the file has changed. Watch inputs after generation so bazel 9 does
# not crash. If the lockfile is repinned, module_ctx.read will crash with a digest mismatch.
if cfg.cargo_lockfile:
module_ctx.watch(cfg.cargo_lockfile)
if cfg.lockfile:
module_ctx.watch(cfg.lockfile)
if cfg.cargo_config:
module_ctx.watch(cfg.cargo_config)
if hasattr(cfg, "manifests"):
for m in cfg.manifests:
module_ctx.watch(m)

metadata_kwargs = {}
if bazel_features.external_deps.extension_metadata_has_reproducible:
metadata_kwargs["reproducible"] = reproducible
Expand Down
Loading