Skip to content

Conversation

@Zalathar
Copy link
Member

Due to some kind of merge/rebase mishap in #101307 and #101173, we ended up with two copies of this query modifier.

Thankfully the redundant copy was harmless.

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 20, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2026

r? @chenyukang

rustbot has assigned @chenyukang.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@lqd
Copy link
Member

lqd commented Jan 20, 2026

r? me @bors r+ rollup

@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 20, 2026

📌 Commit 694b86e has been approved by lqd

It is now in the queue for this repository.

@rust-bors rust-bors bot added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 20, 2026
@rust-bors rust-bors bot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 20, 2026
rust-bors bot pushed a commit that referenced this pull request Jan 20, 2026
Rollup of 6 pull requests

Successful merges:

 - #147611 (Stabilize `-Zremap-path-scope`)
 - #149058 (FCW Lint when using an ambiguously glob imported trait)
 - #149644 (Create x86_64-unknown-linux-gnuasan target which enables ASAN by default)
 - #150524 (Test that -Zbuild-std=core works on a variety of profiles)
 - #151394 (Fix typos: 'occured' -> 'occurred' and 'non_existant' -> 'non_existent')
 - #151396 (`rustc_queries!`: Don't push the `(cache)` modifier twice)

r? @ghost
@rust-bors rust-bors bot merged commit 83ce00e into rust-lang:main Jan 20, 2026
11 checks passed
rust-timer added a commit that referenced this pull request Jan 20, 2026
Rollup merge of #151396 - cache-cache, r=lqd

`rustc_queries!`: Don't push the `(cache)` modifier twice

Due to some kind of merge/rebase mishap in #101307 and #101173, we ended up with two copies of this query modifier.

Thankfully the redundant copy was harmless.

- #101307
- #101173
@rustbot rustbot added this to the 1.95.0 milestone Jan 20, 2026
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jan 20, 2026
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#147611 (Stabilize `-Zremap-path-scope`)
 - rust-lang/rust#149058 (FCW Lint when using an ambiguously glob imported trait)
 - rust-lang/rust#149644 (Create x86_64-unknown-linux-gnuasan target which enables ASAN by default)
 - rust-lang/rust#150524 (Test that -Zbuild-std=core works on a variety of profiles)
 - rust-lang/rust#151394 (Fix typos: 'occured' -> 'occurred' and 'non_existant' -> 'non_existent')
 - rust-lang/rust#151396 (`rustc_queries!`: Don't push the `(cache)` modifier twice)

r? @ghost
@Zalathar Zalathar deleted the cache-cache branch January 20, 2026 22:49
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jan 21, 2026
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#147611 (Stabilize `-Zremap-path-scope`)
 - rust-lang/rust#149058 (FCW Lint when using an ambiguously glob imported trait)
 - rust-lang/rust#149644 (Create x86_64-unknown-linux-gnuasan target which enables ASAN by default)
 - rust-lang/rust#150524 (Test that -Zbuild-std=core works on a variety of profiles)
 - rust-lang/rust#151394 (Fix typos: 'occured' -> 'occurred' and 'non_existant' -> 'non_existent')
 - rust-lang/rust#151396 (`rustc_queries!`: Don't push the `(cache)` modifier twice)

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants