Rollup of 8 pull requests #120665

matthiaskrgr · 2024-02-05T08:41:03Z

Successful merges:

Account for unbounded type param receiver in suggestions #120396 (Account for unbounded type param receiver in suggestions)
update indirect_structural_match and pointer_structural_match lints to match RFC and to show up for dependencies #120423 (update indirect structural match lints to match RFC and to show up for dependencies)
Suggest name value cfg when only value is used for check-cfg #120435 (Suggest name value cfg when only value is used for check-cfg)
Account for non-overlapping unmet trait bounds in suggestion #120507 (Account for non-overlapping unmet trait bounds in suggestion)
Make NonZero constructors generic. #120521 (Make NonZero constructors generic.)
Switch OwnedStore handle count to AtomicU32 #120527 (Switch OwnedStore handle count to AtomicU32)
Continue to borrowck even if there were previous errors #120550 (Continue to borrowck even if there were previous errors)
Make Emitter::emit_diagnostic consuming. #120575 (Simplify codegen diagnostic handling)

r? @ghost
@rustbot modify labels: rollup

… compat reports

and bless a test I missed

Co-authored-by: Urgau <3616612+Urgau@users.noreply.github.com>

When encountering ```rust fn f<T>(a: T, b: T) -> std::cmp::Ordering { a.cmp(&b) //~ ERROR E0599 } ``` output ``` error[E0599]: no method named `cmp` found for type parameter `T` in the current scope --> $DIR/method-on-unbounded-type-param.rs:2:7 | LL | fn f<T>(a: T, b: T) -> std::cmp::Ordering { | - method `cmp` not found for this type parameter LL | a.cmp(&b) | ^^^ method cannot be called on `T` due to unsatisfied trait bounds | = help: items from traits can only be used if the type parameter is bounded by the trait help: the following traits define an item `cmp`, perhaps you need to restrict type parameter `T` with one of them: | LL | fn f<T: Ord>(a: T, b: T) -> std::cmp::Ordering { | +++++ LL | fn f<T: Iterator>(a: T, b: T) -> std::cmp::Ordering { | ++++++++++ ``` Fix rust-lang#120186.

When a method not found on a type parameter could have been provided by any of multiple traits, suggest each trait individually, instead of a single suggestion to restrict the type parameter with *all* of them. Before: ``` error[E0599]: the method `cmp` exists for reference `&T`, but its trait bounds were not satisfied --> $DIR/method-on-unbounded-type-param.rs:5:10 | LL | (&a).cmp(&b) | ^^^ method cannot be called on `&T` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `T: Ord` which is required by `&T: Ord` `&T: Iterator` which is required by `&mut &T: Iterator` `T: Iterator` which is required by `&mut T: Iterator` help: consider restricting the type parameters to satisfy the trait bounds | LL | fn g<T>(a: T, b: T) -> std::cmp::Ordering where T: Iterator, T: Ord { | +++++++++++++++++++++++++ ``` After: ``` error[E0599]: the method `cmp` exists for reference `&T`, but its trait bounds were not satisfied --> $DIR/method-on-unbounded-type-param.rs:5:10 | LL | (&a).cmp(&b) | ^^^ method cannot be called on `&T` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `T: Ord` which is required by `&T: Ord` `&T: Iterator` which is required by `&mut &T: Iterator` `T: Iterator` which is required by `&mut T: Iterator` = help: items from traits can only be used if the type parameter is bounded by the trait help: the following traits define an item `cmp`, perhaps you need to restrict type parameter `T` with one of them: | LL | fn g<T: Ord>(a: T, b: T) -> std::cmp::Ordering { | +++++ LL | fn g<T: Iterator>(a: T, b: T) -> std::cmp::Ordering { | ++++++++++ ``` Fix rust-lang#108428.

…peof` expression

…as already tainted

To send a diagnostic from a codegen thread to the main thread, `SharedEmitter` currently converts the `rustc_errors::Diagnostic` into a one or more `rustc_codegen_ssa::Diagnostic`s, sends them, and then `SharedEmitterMain` reconstructs them at the other end into a `rustc_errors::Diagnostic`. This is a lossy operation, because of differences between the two `Diagnostic` types. Instead we can just clone the `rustc_errors::Diagnostic` and send it directly. Maybe in the past `rustc_errors::Diagnostic` wasn't `Send`? But it works now. Much simpler and nicer.

It's now always paired with a `SharedEmitterMessage::Diagnostic`, so the two message kinds can be combined.

All the other `emit`/`emit_diagnostic` methods were recently made consuming (e.g. rust-lang#119606), but this one wasn't. But it makes sense to. Much of this is straightforward, and lots of `clone` calls are avoided. There are a couple of tricky bits. - `Emitter::primary_span_formatted` no longer takes a `Diagnostic` and returns a pair. Instead it takes the two fields from `Diagnostic` that it used (`span` and `suggestions`) as `&mut`, and modifies them. This is necessary to avoid the cloning of `diag.children` in two emitters. - `from_errors_diagnostic` is rearranged so various uses of `diag` occur before the consuming `emit_diagnostic` call.

…param, r=nnethercote Account for unbounded type param receiver in suggestions When encountering ```rust fn f<T>(a: T, b: T) -> std::cmp::Ordering { a.cmp(&b) //~ ERROR E0599 } ``` output ``` error[E0599]: no method named `cmp` found for type parameter `T` in the current scope --> $DIR/method-on-unbounded-type-param.rs:2:7 | LL | fn f<T>(a: T, b: T) -> std::cmp::Ordering { | - method `cmp` not found for this type parameter LL | a.cmp(&b) | ^^^ method cannot be called on `T` due to unsatisfied trait bounds | = help: items from traits can only be used if the type parameter is bounded by the trait help: the following traits define an item `cmp`, perhaps you need to restrict type parameter `T` with one of them: | LL | fn f<T: Ord>(a: T, b: T) -> std::cmp::Ordering { | +++++ LL | fn f<T: Iterator>(a: T, b: T) -> std::cmp::Ordering { | ++++++++++ ``` Fix rust-lang#120186.

…, r=petrochenkov update indirect structural match lints to match RFC and to show up for dependencies This is a large step towards implementing rust-lang/rfcs#3535. We currently have five lints related to "the structural match situation": - nontrivial_structural_match - indirect_structural_match - pointer_structural_match - const_patterns_without_partial_eq - illegal_floating_point_literal_pattern This PR concerns the first 3 of them. (The 4th already is set up to show for dependencies, and the 5th is removed by rust-lang#116284.) nontrivial_structural_match is being removed as per the RFC; the other two are enabled to show up in dependencies. Fixes rust-lang#73448 by removing the affected analysis.

…ame, r=Urgau,Nilstrieb Suggest name value cfg when only value is used for check-cfg Fixes rust-lang#120427 r? ```````@Nilstrieb```````

Account for non-overlapping unmet trait bounds in suggestion When a method not found on a type parameter could have been provided by any of multiple traits, suggest each trait individually, instead of a single suggestion to restrict the type parameter with *all* of them. Before: ``` error[E0599]: the method `cmp` exists for reference `&T`, but its trait bounds were not satisfied --> $DIR/method-on-unbounded-type-param.rs:5:10 | LL | (&a).cmp(&b) | ^^^ method cannot be called on `&T` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `T: Ord` which is required by `&T: Ord` `&T: Iterator` which is required by `&mut &T: Iterator` `T: Iterator` which is required by `&mut T: Iterator` help: consider restricting the type parameters to satisfy the trait bounds | LL | fn g<T>(a: T, b: T) -> std::cmp::Ordering where T: Iterator, T: Ord { | +++++++++++++++++++++++++ ``` After: ``` error[E0599]: the method `cmp` exists for reference `&T`, but its trait bounds were not satisfied --> $DIR/method-on-unbounded-type-param.rs:5:10 | LL | (&a).cmp(&b) | ^^^ method cannot be called on `&T` due to unsatisfied trait bounds | = note: the following trait bounds were not satisfied: `T: Ord` which is required by `&T: Ord` `&T: Iterator` which is required by `&mut &T: Iterator` `T: Iterator` which is required by `&mut T: Iterator` = help: items from traits can only be used if the type parameter is bounded by the trait help: the following traits define an item `cmp`, perhaps you need to restrict type parameter `T` with one of them: | LL | fn g<T: Ord>(a: T, b: T) -> std::cmp::Ordering { | +++++ LL | fn g<T: Iterator>(a: T, b: T) -> std::cmp::Ordering { | ++++++++++ ``` Fix rust-lang#108428. Follow up to rust-lang#120396, only last commit is relevant.

…ructors, r=dtolnay,oli-obk Make `NonZero` constructors generic. This makes `NonZero` constructors generic, so that `NonZero::new` can be used without turbofish syntax. Tracking issue: rust-lang#120257 ~~I cannot figure out how to make this work with `const` traits. Not sure if I'm using it wrong or whether there's a bug:~~ ```rust 101 | if n == T::ZERO { | ^^^^^^^^^^^^ expected `host`, found `true` | = note: expected constant `host` found constant `true` ``` r? ````@dtolnay````

…ochenkov Switch OwnedStore handle count to AtomicU32 This is already panics if overflowing a u32, so let's use the smaller int size to save a tiny bit of memory.

Continue to borrowck even if there were previous errors but only from the perspective of the whole compiler. Individual items should not get borrowcked if their MIR is tainted by errors. r? ````@estebank```` ````@nnethercote````

…handling, r=estebank Simplify codegen diagnostic handling Some nice improvements. Details in the individual commit logs. r? ``@estebank``

matthiaskrgr · 2024-02-05T08:41:24Z

@bors r+ rollup=never p=8

bors · 2024-02-05T08:41:27Z

📌 Commit bc0d618 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-02-05T09:09:22Z

⌛ Testing commit bc0d618 with merge d75f200...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#120396 (Account for unbounded type param receiver in suggestions) - rust-lang#120423 (update indirect structural match lints to match RFC and to show up for dependencies) - rust-lang#120435 (Suggest name value cfg when only value is used for check-cfg) - rust-lang#120507 (Account for non-overlapping unmet trait bounds in suggestion) - rust-lang#120521 (Make `NonZero` constructors generic.) - rust-lang#120527 (Switch OwnedStore handle count to AtomicU32) - rust-lang#120550 (Continue to borrowck even if there were previous errors) - rust-lang#120575 (Simplify codegen diagnostic handling) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-02-05T09:19:07Z

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

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

   Compiling pathdiff v0.2.1
[RUSTC-TIMING] pathdiff test:false 0.039
[RUSTC-TIMING] rustc_trait_selection test:false 116.104
   Compiling rustc_codegen_ssa v0.0.0 (/checkout/compiler/rustc_codegen_ssa)
error[E0277]: the trait bound `rustc_span::Span: std::marker::Send` is not satisfied in `SharedEmitterMessage`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1257:78
     |
1257 |       return B::spawn_named_thread(cgcx.time_trace, "coordinator".to_string(), move || {
     |  ____________---------------------_____________________________________________^
     | |            required by a bound introduced by this call
1258 | |         let mut worker_id_counter = 0;
1258 | |         let mut worker_id_counter = 0;
1259 | |         let mut free_worker_ids = Vec::new();
1260 | |         let mut get_worker_id = |free_worker_ids: &mut Vec<usize>| {
1618 | |         })
1619 | |     })
1619 | |     })
     | |_____^ within `SharedEmitterMessage`, the trait `std::marker::Send` is not implemented for `rustc_span::Span`
note: required because it appears within the type `Diagnostic`
    --> /checkout/compiler/rustc_errors/src/diagnostic.rs:98:12
     |
98   | pub struct Diagnostic {
98   | pub struct Diagnostic {
     |            ^^^^^^^^^^
note: required because it appears within the type `SharedEmitterMessage`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1754:6
     |
1754 | enum SharedEmitterMessage {
     |      ^^^^^^^^^^^^^^^^^^^^
     = note: required for `Sender<SharedEmitterMessage>` to implement `std::marker::Send`
note: required because it appears within the type `SharedEmitter`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1761:12
1761 | pub struct SharedEmitter {
     |            ^^^^^^^^^^^^^
note: required because it's used within this closure
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1257:78
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1257:78
     |
1257 |     return B::spawn_named_thread(cgcx.time_trace, "coordinator".to_string(), move || {
     |                                                                              ^^^^^^^
note: required by a bound in `backend::ExtraBackendMethods::spawn_named_thread`
     |
     |
140  |     fn spawn_named_thread<F, T>(
...
147  |         F: Send + 'static,
147  |         F: Send + 'static,
     |            ^^^^ required by this bound in `ExtraBackendMethods::spawn_named_thread`

error[E0277]: the trait bound `rustc_span::Span: std::marker::Send` is not satisfied in `SharedEmitterMessage`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1696:70
     |
1696 |       B::spawn_named_thread(cgcx.time_trace, work.short_description(), move || {
     |  _____---------------------____________________________________________^
     | |     required by a bound introduced by this call
     | |     required by a bound introduced by this call
1697 | |         // Set up a destructor which will fire off a message that we're done as
1698 | |         // we exit.
1699 | |         struct Bomb<B: ExtraBackendMethods> {
1749 | |         };
1750 | |     })
1750 | |     })
     | |_____^ within `SharedEmitterMessage`, the trait `std::marker::Send` is not implemented for `rustc_span::Span`
note: required because it appears within the type `Diagnostic`
    --> /checkout/compiler/rustc_errors/src/diagnostic.rs:98:12
     |
98   | pub struct Diagnostic {
98   | pub struct Diagnostic {
     |            ^^^^^^^^^^
note: required because it appears within the type `SharedEmitterMessage`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1754:6
     |
1754 | enum SharedEmitterMessage {
     |      ^^^^^^^^^^^^^^^^^^^^
     = note: required for `Sender<SharedEmitterMessage>` to implement `std::marker::Send`
note: required because it appears within the type `SharedEmitter`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1761:12
1761 | pub struct SharedEmitter {
     |            ^^^^^^^^^^^^^
note: required because it appears within the type `CodegenContext<B>`
    --> compiler/rustc_codegen_ssa/src/back/write.rs:328:12
    --> compiler/rustc_codegen_ssa/src/back/write.rs:328:12
     |
328  | pub struct CodegenContext<B: WriteBackendMethods> {
note: required because it's used within this closure
    --> compiler/rustc_codegen_ssa/src/back/write.rs:1696:70
     |
     |
1696 |     B::spawn_named_thread(cgcx.time_trace, work.short_description(), move || {
     |                                                                      ^^^^^^^
note: required by a bound in `backend::ExtraBackendMethods::spawn_named_thread`
     |
     |
140  |     fn spawn_named_thread<F, T>(
...
147  |         F: Send + 'static,
147  |         F: Send + 'static,
     |            ^^^^ required by this bound in `ExtraBackendMethods::spawn_named_thread`
For more information about this error, try `rustc --explain E0277`.
[RUSTC-TIMING] rustc_codegen_ssa test:false 1.528
error: could not compile `rustc_codegen_ssa` (lib) due to 2 previous errors
warning: build failed, waiting for other jobs to finish...

bors · 2024-02-05T09:19:13Z

💔 Test failed - checks-actions

RalfJung and others added 29 commits January 27, 2024 13:50

get rid of nontrivial_structural_match lint and custom_eq const qualif

4272f1b

show indirect_structural_match and pointer_structural_match in future…

32e4862

… compat reports

update the tracking issue for structural match violations

0808691

and bless a test I missed

merge the accepted-structural-match tests into one

efbfb04

Suggest name value cfg when only value is used for check-cfg

c367983

limit the names_possiblilities to less than 3

0213c87

Co-authored-by: Urgau <3616612+Urgau@users.noreply.github.com>

add testcase for more than 3 cfg names

ca243e7

Add test for method on unbounded type parameter receiver

d34b0fa

fix rebase

9ccc770

Simplify impl_zeroable_primitive macro.

0f55e1b

Make NonZero constructors generic.

a5042de

Switch OwnedStore handle count to AtomicU32

3cc601a

Already poison the type_of result of the anon const used in the `ty…

a2a3c61

…peof` expression

inline a function that is only used in clippy

009f970

Taint borrowck results without running any borrowck if the MIR body w…

0c4d089

…as already tainted

Continue to borrowck even if there were previous errors

0f3976b

Remove SharedEmitterMessage::AbortIfErrors.

4c038bd

It's now always paired with a `SharedEmitterMessage::Diagnostic`, so the two message kinds can be combined.

Rollup merge of rust-lang#120435 - chenyukang:yukang-fix-120427-cfg-n…

0acfc79

…ame, r=Urgau,Nilstrieb Suggest name value cfg when only value is used for check-cfg Fixes rust-lang#120427 r? ```````@Nilstrieb```````

Rollup merge of rust-lang#120527 - GnomedDev:atomicu32-handle, r=petr…

a66a9f6

…ochenkov Switch OwnedStore handle count to AtomicU32 This is already panics if overflowing a u32, so let's use the smaller int size to save a tiny bit of memory.

Rollup merge of rust-lang#120575 - nnethercote:simplify-codegen-diag-…

bc0d618

…handling, r=estebank Simplify codegen diagnostic handling Some nice improvements. Details in the individual commit logs. r? ``@estebank``

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 5, 2024

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 Feb 5, 2024

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 Feb 5, 2024

matthiaskrgr mentioned this pull request Feb 5, 2024

Make Emitter::emit_diagnostic consuming. #120575

Merged

matthiaskrgr closed this Feb 5, 2024

matthiaskrgr deleted the rollup-b8b773z branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #120665

Rollup of 8 pull requests #120665

matthiaskrgr commented Feb 5, 2024

matthiaskrgr commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

rust-log-analyzer commented Feb 5, 2024

bors commented Feb 5, 2024

Rollup of 8 pull requests #120665

Rollup of 8 pull requests #120665

Conversation

matthiaskrgr commented Feb 5, 2024

matthiaskrgr commented Feb 5, 2024

bors commented Feb 5, 2024

bors commented Feb 5, 2024

rust-log-analyzer commented Feb 5, 2024

bors commented Feb 5, 2024