Rollup of 6 pull requests#154746
Merged
rust-bors[bot] merged 17 commits intorust-lang:mainfrom Apr 3, 2026
Merged
Conversation
I previously tried to remove this field because it seemed useless.
`rustc_queries` generates a macro and two modules. One of the modules
looks like this:
```
mod _description_fns {
...
#[allow(unused_variables)]
pub fn hir_module_items<'tcx>(tcx: TyCtxt<'tcx>, key: LocalModDefId) -> String {
format!("getting HIR module items in `{}`", tcx.def_path_str(key))
}
...
}
```
Members of this module are then used in `TaggedQueryKey::description`.
This commit removes the `_description_fns` module entirely. For each
query we now instead generate a description closure that is used
instead. This closure is passed in the modifiers list.
This change simplifies `rustc_queries` quite a bit. It requires adding
another query modifier, but query modifiers are how other query-specific
details are already passed to the declarative macros, so it's more
consistent.
This modifier indicates that a query has a custom handler for cycles. That custom handler must be found at `rustc_query_impl::handle_cycle_error::$name`. This eliminates the need for `specialize_query_vtables`, which is the current hack to install custom handlers. It's more lines of code in total, but indicating special treatment of a query via a modifier in `queries.rs` is more consistent with how other aspects of queries are handled.
…ode_examples-macro_rules, r=GuillaumeGomez rustdoc_missing_doc_code_examples: lint on macro_rules macros part of rust-lang#154640 accidentally built this on top of rust-lang#154644, but since that PR is already approved it should be fine if we just wait for it to be merged. r? @GuillaumeGomez
…2, r=Zalathar Improve workings of the `desc` query modifier and custom query cycle handlers This PR does two things involving query modifiers. - It changes how the `desc` query modifier is handled, eliminating the generated `_description_fns` module. - It adds a new `handle_cycle_error` query modifier for queries that do custom cycle handling. Details are in the individual commits. r? @Zalathar
…ng-crate-noise, r=kivooeo Stop compiling when we get resolving crate failure Fixes rust-lang#154096 closes rust-lang#118130
Add a regression test for the duplicated `crate` keyword in path suggestions The issue has (long) been fixed, but needs a test. Closes rust-lang#115858.
ci: update upload-artifact action to v7 Closes rust-lang#154738
Enforce `#![warn(unreachable_pub)]` in compiletest source The actual public API surface of compiletest is restricted to two specific modules, `cli` and `rustdoc_gui_test`. Other items have no reason to be `pub`. There should be no change to compiletest behaviour.
rustbot
added
A-CI
Member
Author
|
@bors r+ rollup=never p=5 |
Contributor
rust-bors
bot
added
the
S-waiting-on-bors
rust-bors
bot
removed
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
rust-bors
bot
added
merged-by-bors
Contributor
Collaborator
|
📌 Perf builds for each rolled up PR:
previous master: 5bbdeaa9a8 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Contributor
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 5bbdeaa (parent) -> f908263 (this PR) Test differencesShow 136 test diffsStage 1
Stage 2
Additionally, 130 doctest diffs were found. These are ignored, as they are noisy. Job group index
Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard f908263775fa86408d0d529dec82baa9ae350529 --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
Collaborator
|
Finished benchmarking commit (f908263): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)Results (primary 2.1%, secondary 0.9%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary -9.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (primary -0.0%, secondary -0.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 485.659s -> 491.353s (1.17%) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
descquery modifier and custom query cycle handlers #154698 (Improve workings of thedescquery modifier and custom query cycle handlers)cratekeyword in path suggestions #154736 (Add a regression test for the duplicatedcratekeyword in path suggestions)#![warn(unreachable_pub)]in compiletest source #154741 (Enforce#![warn(unreachable_pub)]in compiletest source)Failed merges:
span_suggestionsalways verbose #154605 (Makespan_suggestionsalways verbose)r? @ghost
Create a similar rollup