Rollup of 7 pull requests #110184

JohnTitor · 2023-04-11T11:28:48Z

Successful merges:

Create "suggested tests" tool in rustbuild #106249 (Create "suggested tests" tool in rustbuild)
Fix transmute intrinsic mir validation ICE #109959 (Fix transmute intrinsic mir validation ICE)
bump futures to use syn 2.0 #110079 (bump futures to use syn 2.0)
Fix x test ui --target foo when download-rustc is enabled #110113 (Fix x test ui --target foo when download-rustc is enabled)
Revert "Don't recover lifetimes/labels containing emojis as character literals" #110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
Fix typos in compiler #110153 (Fix typos in compiler)
Symbol cleanups #110175 (Symbol cleanups)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

… literals" Reverts PR rust-lang#108031 Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

Previously, we would never build the target std, only the host std.

For a common pattern.

There's a bad pattern matching confusion present in this function. `_anon` gets assigned to, and then `_anon` is used as an unbound variable in the pattern, which is unrelated to the first `_anon`. If the `_anon` didn't start with `_` the compiler would give warnings. This was introduced in rust-lang#104239. I have rewritten the function to remove the confusion and preserve the existing behaviour. This seems safest, because the original intent is not clear.

Create "suggested tests" tool in `rustbuild` Not the claimed person in rust-lang#97339 but: I've done a very rough implementation of this feature in-tree. I'm very new to `rustc` development (outside of docs) so some help would be greatly appreciated. The UI of this new subcommand obviously will change and I need some mentoring with the `--run` flag. r? `@jyn514`

…ompiler-errors Fix transmute intrinsic mir validation ICE I stumbled across this at work, the minimal reproducer is included as a test which ICEs before this change. I'm not 100% sure this is the right fix, but it matches what we do in `mir_assign_valid_types` so seems reasonable at least. fixes rust-lang#110151 r? `@lcnr` since they've been keeping the relevant logic correct, cc `@scottmcm`

…Mark-Simulacrum bump `futures` to use syn 2.0 cc rust-lang#109302

…ertlarsan68 Fix `x test ui --target foo` when download-rustc is enabled Previously, we would never build the target std, only the host std: ``` ; x t tests/ui/attributes --target wasm32-unknown-unknown Building bootstrap Finished dev [unoptimized] target(s) in 0.02s Building stage0 library artifacts (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.08s Building tool compiletest (stage0) Finished release [optimized] target(s) in 0.09s Check compiletest suite=ui mode=ui (x86_64-unknown-linux-gnu -> wasm32-unknown-unknown) thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Error { depth: 0, inner: Io { path: Some("/home/jyn/src/rust2/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/wasm32-unknown-unknown/lib"), err: Os { code: 2, kind: NotFound, message: "No such file or directory" } } }', src/tools/compiletest/src/main.rs:842:31 ``` Helps with rust-lang#81930.

…avidtwco Revert "Don't recover lifetimes/labels containing emojis as character literals" Reverts PR rust-lang#108031 per rust-lang#109754 (comment) Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

Fix typos in compiler I ran [`typos -w compiler`](https://github.com/crate-ci/typos) to fix typos in the `compiler` directory. Refs rust-lang#110150

…kh726 Symbol cleanups r? `@jackh726` cc `@b-naber`

JohnTitor · 2023-04-11T11:29:07Z

@bors r+ p=7 rollup=never

bors · 2023-04-11T11:29:10Z

📌 Commit 6da0eba has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-04-11T13:02:01Z

⌛ Testing commit 6da0eba with merge 315d391eab00a61c876369b5a45137212d31fe7d...

bors · 2023-04-11T13:05:10Z

💔 Test failed - checks-actions

rust-log-analyzer · 2023-04-11T21:52:25Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

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

   Compiling fd-lock v3.0.11
   Compiling toml v0.5.9
   Compiling xz2 v0.1.6
   Compiling sysinfo v0.26.7
error[E0277]: the trait bound `BuildMetrics: Clone` is not satisfied
    |
193 | #[derive(Clone)]
    |          ----- in this derive macro expansion
...
...
244 |     metrics: metrics::BuildMetrics,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `BuildMetrics`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0277`.
error: could not compile `bootstrap` due to previous error
error: could not compile `bootstrap` due to previous error
failed to run: /checkout/obj/build/aarch64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:32
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0277]: the trait bound `BuildMetrics: Clone` is not satisfied
    |
193 | #[derive(Clone)]
    |          ----- in this derive macro expansion
...
...
244 |     metrics: metrics::BuildMetrics,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `BuildMetrics`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0277`.
error: could not compile `bootstrap` due to previous error
error: could not compile `bootstrap` due to previous error
failed to run: /checkout/obj/build/aarch64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0277]: the trait bound `BuildMetrics: Clone` is not satisfied
    |
193 | #[derive(Clone)]
    |          ----- in this derive macro expansion
...
...
244 |     metrics: metrics::BuildMetrics,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `BuildMetrics`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0277`.
error: could not compile `bootstrap` due to previous error
error: could not compile `bootstrap` due to previous error
failed to run: /checkout/obj/build/aarch64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0277]: the trait bound `BuildMetrics: Clone` is not satisfied
    |
193 | #[derive(Clone)]
    |          ----- in this derive macro expansion
...
...
244 |     metrics: metrics::BuildMetrics,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `BuildMetrics`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0277`.
error: could not compile `bootstrap` due to previous error
error: could not compile `bootstrap` due to previous error
failed to run: /checkout/obj/build/aarch64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked --features build-metrics
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0277]: the trait bound `BuildMetrics: Clone` is not satisfied
    |
193 | #[derive(Clone)]
    |          ----- in this derive macro expansion
...
...
244 |     metrics: metrics::BuildMetrics,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Clone` is not implemented for `BuildMetrics`
    = note: this error originates in the derive macro `Clone` (in Nightly builds, run with -Z macro-backtrace for more info)

For more information about this error, try `rustc --explain E0277`.
error: could not compile `bootstrap` due to previous error

fee1-dead and others added 19 commits April 8, 2023 09:38

bump futures to use syn 2.0

2c64688

feat: implement basic suggest-tests tool

1e95cdd

Fix transmute intrinsic mir validation ICE

d8ed2fb

Revert "Don't recover lifetimes/labels containing emojis as character…

a047064

… literals" Reverts PR rust-lang#108031 Fixes (doesnt close until beta backported) rust-lang#109746 This reverts commit e3f9db5. This reverts commit 98b82ae. This reverts commit 380fa26.

Fix typos in compiler

677357d

Update ty_utils_never_to_any_not_supported diagnostic message

f06640d

Revert method-not-found-generic-arg-elision test bless

40f12c6

Fix x test ui --target foo when download-rustc is enabled

47ff60d

Previously, we would never build the target std, only the host std.

Introduce Region::get_name_or_anon.

5716ae6

For a common pattern.

Use the existing static and env symbols instead of interning.

bd7f301

Add sym::anon.

7975779

Rollup merge of rust-lang#110079 - fee1-dead-contrib:bump-futures, r=…

10f9313

…Mark-Simulacrum bump `futures` to use syn 2.0 cc rust-lang#109302

Rollup merge of rust-lang#110153 - DaniPopes:compiler-typos, r=Nilstrieb

4ecada0

Fix typos in compiler I ran [`typos -w compiler`](https://github.com/crate-ci/typos) to fix typos in the `compiler` directory. Refs rust-lang#110150

Rollup merge of rust-lang#110175 - nnethercote:symbol-cleanups, r=jac…

6da0eba

…kh726 Symbol cleanups r? `@jackh726` cc `@b-naber`

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 Apr 11, 2023

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 Apr 11, 2023

compiler-errors closed this Apr 11, 2023

JohnTitor deleted the rollup-gs07n02 branch June 25, 2023 14:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #110184

Rollup of 7 pull requests #110184

JohnTitor commented Apr 11, 2023

JohnTitor commented Apr 11, 2023

bors commented Apr 11, 2023

bors commented Apr 11, 2023

bors commented Apr 11, 2023

rust-log-analyzer commented Apr 11, 2023

Rollup of 7 pull requests #110184

Rollup of 7 pull requests #110184

Conversation

JohnTitor commented Apr 11, 2023

JohnTitor commented Apr 11, 2023

bors commented Apr 11, 2023

bors commented Apr 11, 2023

bors commented Apr 11, 2023

rust-log-analyzer commented Apr 11, 2023