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.

Sign up for GitHub

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

Jump to bottom

Rollup of 3 pull requests #112462

Closed
wants to merge 8 commits into from
Closed

Rollup of 3 pull requests #112462

wants to merge 8 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 8 commits May 22, 2023 17:41
@petrochenkov
expand: Change how #![cfg(FALSE)] behaves on crate root
bfc21b1 
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.
@compiler-errors
deduplicate identical region constraints
d5e25d4
@GuillaumeGomez
List matching impls on type aliases
4b1d13d
@GuillaumeGomez
Add regression test for rust-lang#32077
6f552c8
@GuillaumeGomez
Fix intra-doc links from pointer appearing in windows HANDLE type alias
2ce7cd9
@GuillaumeGomez
Rollup merge of rust-lang#110141 - petrochenkov:cratecfg2, r=WaffleLa…
69cf0f9 
…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
@GuillaumeGomez
Rollup merge of rust-lang#112429 - GuillaumeGomez:ty-alias-impls, r=n…
a513f4e 
…otriddle,lcnr

[rustdoc] List matching impls on type aliases

Fixes rust-lang#32077.

Thanks a lot to `@lcnr` who helped me a lot with this fix!

cc `@notriddle`
r? `@lcnr`
@GuillaumeGomez
Rollup merge of rust-lang#112442 - compiler-errors:next-solver-dedupl…
a07664a 
…icate-region-constraints, r=lcnr

Deduplicate identical region constraints in new solver

the new solver doesn't track whether we've already proven a goal like the fulfillment context's obligation forest does, so we may be instantiating a canonical response (and specifically, its nested region obligations) quite a few times.

This may lead to exponentially gathering up identical region constraints for things like auto traits, so let's deduplicate region constraints when in `compute_external_query_constraints`.

r? `@lcnr`
@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-libs Relevant to the library 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 rollup A PR which is a rollup labels Jun 9, 2023
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=3 rollup=never

@bors
Copy link
Contributor

bors commented Jun 9, 2023

📌 Commit a07664a has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors bors 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 Jun 9, 2023
@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:37

@GuillaumeGomez
Copy link
Member Author

Failed because of #110141. Maybe a conflict with #112442.

@GuillaumeGomez GuillaumeGomez deleted the rollup-453eizc branch June 9, 2023 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup 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. T-libs Relevant to the library 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@GuillaumeGomez @bors @rust-log-analyzer @rustbot @petrochenkov @compiler-errors