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 9 pull requests #102153

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

diegooliveira and others added 24 commits September 14, 2022 15:05
This allows the tests to pass even if the user has RUST_BACKTRACE
set when running 'x.py'
This was previously limited to partial relro, citing issues on RHEL6,
but that's no longer a supported platform since rust-lang#95026. We have long
been enabling full relro in RHEL7's own Rust builds for ppc64, without
trouble, so it should be fine to drop this workaround.
This code was added in 003b2bc to prevent
these headers from overlapping `.out-of-band` side items. That stopped
being a problem when 3f92ff3 switched
rustdoc over to using `float`, rather than `position: absolute`, to
implement this.
PR rust-lang#101224 added support for async fn in trait desuraging behind the
return_position_impl_trait_in_trait feature.

Split this out so that it's behind its own feature gate, since async fn
in trait doesn't need to follow the same stabilization schedule.
Instead of relying on a command line parameter, detect if a target
is able to unwind or not.
Ignore tests that require unwinding on targets that don't support it.
This test case actually requires std::process.
…iler-errors

Split out async_fn_in_trait into a separate feature

PR rust-lang#101224 added support for async fn in trait desuraging behind the `return_position_impl_trait_in_trait` feature.

Split this out so that it's behind its own feature gate, since async fn in trait doesn't need to follow the same stabilization schedule.
Note if mismatched types have a similar name

If users get a type error between similarly named types, it will point out that these are actually different types, and where they were defined.
Migrated the rustc_passes annotation without effect diagnostic infrastructure

Small change to move the validation for annotations to the new diagnostic infrastructure.
…to-rustup, r=Mark-Simulacrum

Distribute rust-docs-json via rustup.

I am not 100% sure on how to treat `rust-json-docs` in `target_host_combination`. I went along with a similar strategy to the one used for `rust-docs`, but looking for guidance there.
…dth, r=GuillaumeGomez

rustdoc: remove unnecessary `max-width` on headers

This code was added in 003b2bc to prevent these headers from overlapping `.out-of-band` side items. That stopped being a problem when 3f92ff3 switched rustdoc over to using `float`, rather than `position: absolute`, to implement this.
Deduplicate two functions that would soon have been three

rust-lang#101900 would have added another copy of this for effects
…k-Simulacrum

Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests

This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py'
Allow full relro on powerpc64-unknown-linux-gnu

This was previously limited to partial relro, citing issues on RHEL6,
but that's no longer a supported platform since rust-lang#95026. We have long
been enabling full relro in RHEL7's own Rust builds for ppc64, without
trouble, so it should be fine to drop this workaround.
Detect panic strategy using `rustc --print cfg`

Instead of relying on a command line parameter, detect if a target is able to unwind or not.
Ignore tests that require unwinding on targets that don't support it.

I did not find any place where the removed parameter has been used, but it feels a bit risky as
I'm new to this test framework.

r? bjorn3
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. rollup A PR which is a rollup labels Sep 22, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Sep 22, 2022

📌 Commit a09acb7 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2022
@bors
Copy link
Contributor

bors commented Sep 23, 2022

⌛ Testing commit a09acb7 with merge 960e10e24aed7a487d2a6da625c3aba99caaa394...

@bors
Copy link
Contributor

bors commented Sep 23, 2022

💔 Test failed - checks-actions

@bors 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 Sep 23, 2022
@rust-log-analyzer
Copy link
Collaborator

The job wasm32 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/extern-flag/empty-extern-arg.rs stdout ----
diff of stderr:

7    = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_personality` is defined in the standard library
8    = help: you may be able to compile for a target that doesn't need `eh_personality`, specify a target with `--target` or in `.cargo/config`
- error: aborting due to 3 previous errors
- error: aborting due to 3 previous errors
+ error: language item required, but not found: `eh_catch_typeinfo`
+    |
+    = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_catch_typeinfo` is defined in the standard library
+    = help: you may be able to compile for a target that doesn't need `eh_catch_typeinfo`, specify a target with `--target` or in `.cargo/config`
+ error: aborting due to 4 previous errors
11 
12 

---
To only update this specific test, also pass `--test-args extern-flag/empty-extern-arg.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/extern-flag/empty-extern-arg.rs" "-Zthreads=1" "--target=wasm32-unknown-emscripten" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/extern-flag/empty-extern-arg" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-unknown-emscripten/native/rust-test-helpers" "--extern" "std=" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/extern-flag/empty-extern-arg/auxiliary"
stdout: none
--- stderr -------------------------------
error: extern location for std does not exist: 

error: `#[panic_handler]` function required, but not found

error: language item required, but not found: `eh_personality`
   |
   = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_personality` is defined in the standard library
   = help: you may be able to compile for a target that doesn't need `eh_personality`, specify a target with `--target` or in `.cargo/config`

error: language item required, but not found: `eh_catch_typeinfo`
   |
   = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_catch_typeinfo` is defined in the standard library
   = help: you may be able to compile for a target that doesn't need `eh_catch_typeinfo`, specify a target with `--target` or in `.cargo/config`
error: aborting due to 4 previous errors
------------------------------------------



---- [ui] src/test/ui/panic-handler/weak-lang-item.rs stdout ----
diff of stderr:

17    = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_personality` is defined in the standard library
18    = help: you may be able to compile for a target that doesn't need `eh_personality`, specify a target with `--target` or in `.cargo/config`
- error: aborting due to 3 previous errors
- error: aborting due to 3 previous errors
+ error: language item required, but not found: `eh_catch_typeinfo`
+    |
+    = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_catch_typeinfo` is defined in the standard library
+    = help: you may be able to compile for a target that doesn't need `eh_catch_typeinfo`, specify a target with `--target` or in `.cargo/config`
+ error: aborting due to 4 previous errors
21 
22 For more information about this error, try `rustc --explain E0259`.
23 
---
To only update this specific test, also pass `--test-args panic-handler/weak-lang-item.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/panic-handler/weak-lang-item.rs" "-Zthreads=1" "--target=wasm32-unknown-emscripten" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/weak-lang-item" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-unknown-emscripten/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/panic-handler/weak-lang-item/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0259]: the name `core` is defined multiple times
   |
LL | extern crate core;
   | ^^^^^^^^^^^^^^^^^^ `core` reimported here
   |
   |
   = note: `core` must be defined only once in the type namespace of this module
help: you can use `as` to change the binding name of the import
LL | extern crate core as other_core;
   |


error: `#[panic_handler]` function required, but not found

error: language item required, but not found: `eh_personality`
   |
   = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_personality` is defined in the standard library
   = help: you may be able to compile for a target that doesn't need `eh_personality`, specify a target with `--target` or in `.cargo/config`

error: language item required, but not found: `eh_catch_typeinfo`
   |
   = note: this can occur when a binary crate with `#![no_std]` is compiled for a target where `eh_catch_typeinfo` is defined in the standard library
   = help: you may be able to compile for a target that doesn't need `eh_catch_typeinfo`, specify a target with `--target` or in `.cargo/config`
error: aborting due to 4 previous errors

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

@davidtwco davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-e49lwui branch October 9, 2022 00:31
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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.