Skip to content
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.

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

Rollup of 4 pull requests #112470

Closed
wants to merge 11 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 11 commits May 22, 2023 17:41
Previously it removed all other attributes from the crate root.
Now it removes only attributes below itself.

So it becomes possible to configure some global crate properties even for fully unconfigured crates.
be more explicit in where we only add new hidden types
and where we also have to deal with item bounds.
…pkin

expand: Change how `#![cfg(FALSE)]` behaves on crate root

Previously it removed all other attributes from the crate root.
Now it removes only attributes below itself (during both regular expansion and pre-configuration).

So it becomes possible to configure some global crate properties even for fully unconfigured crates.

Fixes rust-lang#104633
Part of rust-lang#110082
…chenkov

Make "consider importing" consistent for macros

Fixes rust-lang#112439
…er-errors

opaque type cleanup

the commits are pretty self-contained.

r? `@compiler-errors` cc `@oli-obk`
…ormats, r=notriddle

Change format of rustdoc-js tests by putting query and correction directly alongside the expected values

As I was working on fixing merge conflicts in rust-lang#108537, I faced quite a big issue when trying to update the `rustdoc-js*` tests. To make it much simpler, this PR moves the `query` and `correction` directly alongside the expected data so now we know what is the query that is being run without needing to add comments or going back to the top of the file.

r? `@notriddle`
@rustbot rustbot added 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jun 9, 2023
@GuillaumeGomez GuillaumeGomez deleted the rollup-80d25eb branch June 9, 2023 18:55
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking rustc_expand v0.0.0 (/checkout/compiler/rustc_expand)
error[E0308]: mismatched types
   --> compiler/rustc_expand/src/config.rs:203:45
    |
203 |         .take_while(|attr| !is_cfg(attr) || strip_unconfigured.cfg_true(attr))
    |                            -------------    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `(bool, Option<MetaItem>)`
    |                            expected because this is `bool`
    |
    = note: expected type `bool`
    = note: expected type `bool`
              found tuple `(bool, Option<rustc_ast::MetaItem>)`
For more information about this error, try `rustc --explain E0308`.
error: could not compile `rustc_expand` (lib) due to previous error
warning: build failed, waiting for other jobs to finish...
Build completed unsuccessfully in 0:00:43

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants