Rollup of 5 pull requests #106306

jyn514 · 2022-12-30T21:03:57Z

Successful merges:

CFI: Monomorphize transparent ADTs before typeid #106232 (CFI: Monomorphize transparent ADTs before typeid)
Use verbose suggestions for mutability errors #106245 (Use verbose suggestions for mutability errors)
refactor: merge error code E0465 into E0464 #106282 (refactor: merge error code E0465 into E0464)
Extend scraped examples layout GUI test for position of buttons #106295 (Extend scraped examples layout GUI test for position of buttons)
bootstrap: Get rid of tail_args in stream_cargo #106305 ( bootstrap: Get rid of tail_args in stream_cargo)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Monomorphise `#[repr(transparent)]` parameterized ADTs before turning them into an Itanium mangled String. `#[repr(transparent)]` ADTs currently use the single field to represent them in their CFI type ID to ensure that they are compatible. However, if that type involves a type parameter instantiated at the ADT level, as in `ManuallyDrop`, this will currently ICE as the `Parameter` type cannot be mangled. Since this happens at lowering time, it should always be concrete after substitution. Fixes rust-lang#106230

Previously, clean only supported `--stage 0` for specific crates. The new `crate_description` function generates a string that looks like ``` : {rustc_query_impl} ```

Before: ``` Testing ["rustc_interface"] stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu) ``` After: ``` Testing {rustc_interface} stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu) ``` Note there is a slight consistency between `build` and `test`: The former doesn't print "compiler artifacts". It would be annoying to fix and doesn't hurt anything, so I left it be. ``` ; x t rustc_interface --stage 0 --dry-run Testing {rustc_interface} stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu) ; x b rustc_interface --stage 0 --dry-run Building {rustc_interface} stage0 compiler artifacts (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu) ```

CFI: Monomorphize transparent ADTs before typeid Monomorphise `#[repr(transparent)]` parameterized ADTs before turning them into an Itanium mangled String. `#[repr(transparent)]` ADTs currently use the single field to represent them in their CFI type ID to ensure that they are compatible. However, if that type involves a type parameter instantiated at the ADT level, as in `ManuallyDrop`, this will currently ICE as the `Parameter` type cannot be mangled. Since this happens at lowering time, it should always be concrete after substitution. Fixes rust-lang#106230

…=eholk Use verbose suggestions for mutability errors

refactor: merge error code `E0465` into `E0464` `E0465` is an undocumented and untested error code that is functionally identical to `E0464`. This PR merges `E0465` into `E0464`, thus documenting and testing another error code (rust-lang#61137). r? `@GuillaumeGomez` (not sure if you want to review this but it's relevant to my other PRs that you have reviewed)

…ples-layout-test, r=notriddle Extend scraped examples layout GUI test for position of buttons This is a regression test for rust-lang#106279. r? `@notriddle`

bootstrap: Get rid of tail_args in stream_cargo Based on rust-lang#106303 for convenience. r? `@Mark-Simulacrum`

jyn514 · 2022-12-30T21:04:33Z

@bors rollup=never p=5 r+

bors · 2022-12-30T21:04:35Z

📌 Commit 430e85a has been approved by jyn514

It is now in the queue for this repository.

jyn514 · 2022-12-30T21:07:57Z

Note that #106305 also contains #106303 and #106271.

bors · 2022-12-30T22:34:30Z

⌛ Testing commit 430e85a with merge 3ac8b6a1ae16fbef728695800a430cf74846bdbd...

bors · 2022-12-30T22:55:46Z

💔 Test failed - checks-actions

rust-log-analyzer · 2022-12-30T22:56:27Z

The job dist-i586-gnu-i586-i686-musl failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


---- [ui] src/test/ui/crate-loading/crateresolve1.rs stdout ----
diff of stderr:

- error[E0464]: multiple candidates for `dylib` dependency `crateresolve1` found
+ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
3    |
4 LL | extern crate crateresolve1;



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1/crateresolve1.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args crate-loading/crateresolve1.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/crate-loading/crateresolve1.rs" "-Zthreads=1" "--target=i686-unknown-linux-musl" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/i686-unknown-linux-musl/native/rust-test-helpers" "-Clinker=/musl-i686/bin/musl-gcc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
   |
LL | extern crate crateresolve1;
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   |
   = note: candidate #1: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1/auxiliary/libcrateresolve1-1.rlib
   = note: candidate #2: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1/auxiliary/libcrateresolve1-2.rlib
   = note: candidate #3: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/crate-loading/crateresolve1/auxiliary/libcrateresolve1-3.rlib
error: aborting due to previous error

For more information about this error, try `rustc --explain E0464`.
------------------------------------------
------------------------------------------


---- [ui] src/test/ui/error-codes/E0464.rs stdout ----
diff of stderr:

- error[E0464]: multiple candidates for `dylib` dependency `crateresolve1` found
+ error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
2   --> $DIR/E0464.rs:11:1
4 LL | extern crate crateresolve1;


The actual stderr differed from the expected stderr.
The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464/E0464.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args error-codes/E0464.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/error-codes/E0464.rs" "-Zthreads=1" "--target=i686-unknown-linux-musl" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/i686-unknown-linux-musl/native/rust-test-helpers" "-Clinker=/musl-i686/bin/musl-gcc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
   |
LL | extern crate crateresolve1;
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   |
   = note: candidate #1: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464/auxiliary/libcrateresolve1-1.rlib
   = note: candidate #2: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464/auxiliary/libcrateresolve1-2.rlib
   = note: candidate #3: /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/error-codes/E0464/auxiliary/libcrateresolve1-3.rlib
error: aborting due to previous error

For more information about this error, try `rustc --explain E0464`.
------------------------------------------

estebank and others added 12 commits December 28, 2022 22:06

Use verbose suggestions for mutability errors

b9439eb

Support x clean --stage 1 rustc_query_impl

cbede85

Previously, clean only supported `--stage 0` for specific crates. The new `crate_description` function generates a string that looks like ``` : {rustc_query_impl} ```

refactor: merge E0465 into E0464

3bb8903

Extend scraped examples layout GUI test for position of buttons

87bc29d

bootstrap: Get rid of tail_args in stream_cargo

9dfe504

Rollup merge of rust-lang#106245 - estebank:mutability-suggestions, r…

6f2b30d

…=eholk Use verbose suggestions for mutability errors

Rollup merge of rust-lang#106295 - GuillaumeGomez:extend-scraped-exam…

14ff27f

…ples-layout-test, r=notriddle Extend scraped examples layout GUI test for position of buttons This is a regression test for rust-lang#106279. r? `@notriddle`

Rollup merge of rust-lang#106305 - jyn514:tail-args, r=Mark-Simulacrum

430e85a

bootstrap: Get rid of tail_args in stream_cargo Based on rust-lang#106303 for convenience. r? `@Mark-Simulacrum`

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 Dec 30, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 30, 2022

jyn514 mentioned this pull request Dec 30, 2022

refactor: merge error code E0465 into E0464 #106282

Merged

jyn514 closed this Dec 30, 2022

jyn514 deleted the rollup-7o44nm2 branch December 30, 2022 23:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests #106306

Rollup of 5 pull requests #106306

Uh oh!

jyn514 commented Dec 30, 2022

Uh oh!

jyn514 commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

jyn514 commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

rust-log-analyzer commented Dec 30, 2022

Uh oh!

Uh oh!

Rollup of 5 pull requests #106306

Rollup of 5 pull requests #106306

Uh oh!

Conversation

jyn514 commented Dec 30, 2022

Uh oh!

jyn514 commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

jyn514 commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

bors commented Dec 30, 2022

Uh oh!

rust-log-analyzer commented Dec 30, 2022

Uh oh!

Uh oh!