Rollup of 11 pull requests#152005
Closed
JonathanBrouwer wants to merge 26 commits intorust-lang:mainfrom
Closed
Conversation
Makes the use expressions significantly shorter.
So that `pub-priv1.rs` test does not have to (ab)use the `aux-crate` directive for this purpose. This is very edge-casey so I don't think we should document this in rustc-dev-guide. If someone needs to do this they will look at the code and easily find the functionality. This is a bit hacky since `--extern priv:pm.rs` is not valid, but we can make our directives work however we want. And I think this is a fine pragmatic approach. Doing it "the right way" would be a lot of work for not much gain. Plus, that work can be done incrementally in small steps in the future if wanted.
It doesn't use `self`, which means it doesn't need to be part of the `QueryContext` trait; we can just call `extract` directly where necessary.
Various `QueryStackFrame` variables are called `query`; `frame` is a better name. And various `QueryInfo` variables are called `frame`; `info` is a better name. This eliminates some confusing `query.query()` occurrences, which is a good sign, and some `frame.query` occurrences become `info.frame`.
Putting `+ 'tcx` on the `QueryDispatcher` trait lets a few other places be simplified.
It's defined and used in `rustc_query_impl`; `rustc_query_system` doesn't need it. So it can just be an inherent method on `QueryCtxt`.
Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized.
The new ambiguities are reported when the import's visibility is ambiguous and may depend on the resolution/expansion order.
Co-authored-by: lcnr <rust@lcnr.de>
resolve: Report more visibility-related early resolution ambiguities for imports The new ambiguities are reported when the import's visibility is ambiguous and may depend on the resolution/expansion order. Detailed description: rust-lang#149596 (comment).
…thar compiletest: Support `--extern` modifiers with `proc-macro` directive So that the `src/tools/compiletest/src/directives/auxiliary/tests.rs` test does not have to (ab)use the `aux-crate` directive for this purpose. This is very edge-casey so I don't think we should document this in rustc-dev-guide. Mentioning it will confuse more than it helps. If someone needs to do this they will look at the code and easily find the functionality. This is a bit hacky since `--extern priv:pm.rs` is not valid, but we can make our directives work however we want. And I think this is a fine pragmatic approach. Doing it "the right way" would be a lot of work for not much gain. Plus, that work can be done incrementally in small steps in the future if wanted. r? @Zalathar --- Follow-up to: - rust-lang#151353 - rust-lang#151670 ### Unblocks: - rust-lang#151691, because without this fix that test fails (see rust-lang#151691 (comment))
…rcote Use `#![feature(adt_const_params)]` for static query flags As suggested by rust-lang#151633 (comment), this replaces multiple clunky const booleans with a single const struct, which is a bit nicer. This should also make it easier to experiment with statically resolving other flags, like `eval_always`. There are currently no other compiler crates using `feature(adt_const_params)`, so hopefully it's mature enough for a simple use-case like this one.
…ianne Use default field values in a few more cases Makes the use expressions significantly shorter.
… r=tgross35 more float constants Add constants discussed in rust-lang#146939 rust-lang/libs-team#661 Retry of rust-lang#146934 r? @tgross35
…-relate, r=lcnr regression test for alias-relate changes in lub r? @lcnr
explain why we dont skip some of this work when there are field projections Perf says it doesn't help 🤷
…int-spans, r=Kivooeo Skip overlapping spans in argument error suggestions Fixes rust-lang#151607
…thar Query cleanups A few small cleanups in the query system. r? @Zalathar
…r=jhpratt Fix uninitialized UEFI globals in tests Export globals via a `doc(hidden)` module. In test code, use the globals from `realstd` so that they are properly initialized. CC @Ayush1325
Port `#[rustc_hidden_type_of_opaque]` to attribute parser
Contributor
Author
|
@bors r+ rollup=never p=5 |
rustbot
added
A-attributes
rustbot
added
A-query-system
Contributor
rust-bors
bot
added
S-waiting-on-bors
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
13 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:
--externmodifiers withproc-macrodirective #151695 (compiletest: Support--externmodifiers withproc-macrodirective)#![feature(adt_const_params)]for static query flags #151938 (Use#![feature(adt_const_params)]for static query flags)#[rustc_hidden_type_of_opaque]to attribute parser #151992 (Port#[rustc_hidden_type_of_opaque]to attribute parser)r? @ghost
Create a similar rollup