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 6 pull requests #112449

Closed
wants to merge 12 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

petrochenkov and others added 12 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.
…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
…ields, r=WaffleLapkin

Don't mention already-set fields in struct constructor missing field error

Fixes rust-lang#111149
…i-obk

Add Terminator::InlineAsm conversion from MIR to SMIR

This is the last variant that needed to be covered for Terminator. As we've discussed with `@oli-obk` I've made a lot of it's fields be `String`s.

r? `@oli-obk`
…=Mark-Simulacrum

add programmerjake to portable-simd cc list
…-resolv-pat, r=lcnr

Structurally resolve pointee in `check_pat_lit`

Gotta make sure to eager norm the pointee of the match scrutinee with the new solver.

r? `@lcnr`
…ethercote

Don't debug-print `Interned` or `PrivateZst`

Instead of, e.g.

`PredefinedOpaques(Interned(PredefinedOpaquesData { ... }, PrivateZst))`

print:

`PredefinedOpaques(PredefinedOpaquesData { ... })`

Mostly observable in debug logs, or ICE backtraces where I saw this.

r? `@nnethercote`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Jun 9, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jun 9, 2023

📌 Commit 1eeffee has been approved by matthiaskrgr

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:47

@matthiaskrgr matthiaskrgr deleted the rollup-57ssemg branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants