Skip to content

Reuse the traversal path’s rule name in the digest cache #583

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

Merged
tinder-maxwellelliott merged 1 commit into from
Oct 28, 2026
Merged

Reuse the traversal path’s rule name in the digest cache #583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,8 +635,8 @@ impl HashContext<'_> {
.get(key)
.cloned()
.ok_or_else(|| anyhow!("Unable to find rule {key}"))?;
let canonical_key = rule.rule.name.clone();
if let Some(index) = path.iter().position(|entry| entry == &canonical_key) {
let canonical_key = &rule.rule.name;
if let Some(index) = path.iter().position(|entry| entry == canonical_key) {
// A back edge: the query graph can hold cycles a build never sees (rules_go's
// `go_context_data` and the nogo analyzers reference each other through non-dependency
// attributes). The target is still being hashed, so stand in with a digest of its own
Expand All @@ -645,7 +645,7 @@ impl HashContext<'_> {
if self.cycle_warnings.insert(canonical_key.clone()) {
let cycle = path[index..]
.iter()
.chain(std::iter::once(&canonical_key))
.chain(std::iter::once(canonical_key))
.cloned()
.collect::<Vec<_>>()
.join(" -> ");
Expand Down Expand Up @@ -730,7 +730,7 @@ impl HashContext<'_> {
builder.direct(source_digest);
} else if let Some(dependency) = self
.resolve_dependency(&encoded_input, input_label, path)
.filter(|dependency| dependency != &canonical_key)
.filter(|dependency| dependency.as_ref() != canonical_key)
{
let digest = self.rule_overall_digest(&dependency, path)?;
builder.transitive(&dependency, digest);
Expand All @@ -747,7 +747,7 @@ impl HashContext<'_> {

if !self.options.ignored_attributes.contains("visibility") {
for package_group in visibility_package_groups(&rule.rule) {
if package_group == target_label(&canonical_key) {
if package_group == target_label(canonical_key) {
continue;
}
let Some(group) = self.rules.get(package_group) else {
Expand All @@ -762,7 +762,7 @@ impl HashContext<'_> {
}
}

path.pop();
let canonical_key = path.pop().expect("rule path contains the current rule");
let digest = builder.finish();
self.cache.insert(canonical_key, digest.clone());
Ok(digest)
Expand Down
Loading