Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Various small query cleanups by nnethercote · Pull Request #153169 · rust-lang/rust · GitHub
Skip to content

Various small query cleanups - #153169

Merged
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc
Mar 2, 2026
Merged

Various small query cleanups#153169
rust-bors[bot] merged 10 commits into
rust-lang:mainfrom
nnethercote:rm-is_anon-etc

Conversation

@nnethercote

Copy link
Copy Markdown
Contributor

I found these while doing a close read of the query code.

r? @oli-obk

@rustbotrustbot 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 Feb 27, 2026
@rustbot

Copy link
Copy Markdown
Collaborator

oli-obk is not on the review rotation at the moment.
They may take a while to respond.

}
}

impl<'tcx> FromCycleError<'tcx> for ty::SymbolName<'_> {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These impl are used with the default CycleErrorHandling::Error, so they don't need a query modifier to make use of them. We don't seem to have a test for the use case of this, so it's probably fine to remove anyway.

@rust-bors

This comment has been minimized.

@rustbot

This comment has been minimized.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 1, 2026

Copy link
Copy Markdown
Contributor

📌 Commit fa5138b has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 1, 2026
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@rust-borsrust-borsBot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 1, 2026
@rust-bors

This comment has been minimized.

This makes it clear the `CycleError` is not used after the call.
When there are two cases of equal size and importance, I find an if/else
expression easier to read than an early return.
It's an unnecessary level of indirection.
Calling `abort_if_errors` after emitting an error is guaranteed to call
`raise_fatal`, so just do that directly instead.
This exact comment block also appears in
`compiler/rustc_middle/src/queries.rs`, which is a better place for it.
`Value` is an unhelpfully generic name. Standard naming procedure for a
trait with a single method is for the trait name to match the method
name, which is what this commit does. Likewise, the enclosing module is
renamed from `values` to `from_cycle_error`.
Also add a comment about some non-obvious behaviour.
It has no effect.
`symbol_name` is the only query that produces a `SymbolName`. If it was
marked with `cycle_delayed_bug`/`cycle_stash` then this `FromCycleError`
impl would make sense, but that's not the case. Maybe it was the case in
the past.
@rustbot

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@nnethercote

Copy link
Copy Markdown
ContributorAuthor

I rebased again.

@bors r=petrochenkov

@rust-bors

rust-borsBot commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 5bd28b8 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 2, 2026
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
Rollup of 6 pull requests
Successful merges:
- #153015 (core: make atomic primitives type aliases of `Atomic<T>`)
- #153046 (Couple of cg_ssa refactorings)
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
jhpratt added a commit to jhpratt/rust that referenced this pull request Mar 2, 2026
…ochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@jhprattjhpratt mentioned this pull request Mar 2, 2026
rust-borsBot pushed a commit that referenced this pull request Mar 2, 2026
…uwer
Rollup of 6 pull requests
Successful merges:
- #153169 (Various small query cleanups)
- #152304 (stabilize new RangeToInclusive type)
- #153046 (Couple of cg_ssa refactorings)
- #153090 (elf-raw-dylib: set type for functions)
- #153225 (tests/ui/asm: add annotations for reference rules)
- #153233 (test: add regression test for fuzzy_provenance_casts lint ICE)
@rust-bors
rust-borsBot merged commit af84b2a into rust-lang:mainMar 2, 2026
11 checks passed
@rustbotrustbot added this to the 1.96.0 milestone Mar 2, 2026
rust-timer added a commit that referenced this pull request Mar 2, 2026
Rollup merge of #153169 - nnethercote:rm-is_anon-etc, r=petrochenkov
Various small query cleanups
I found these while doing a close read of the query code.
r? @oli-obk
@nnethercote
nnethercote deleted the rm-is_anon-etc branch March 2, 2026 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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.

5 participants

@nnethercote@rustbot@Zoxc@petrochenkov@oli-obk