Do not call `extern_crate` on current trait on crate mismatch errors #133585

estebank · 2024-11-28T17:56:43Z

When we encounter an error caused by traits/types of different versions of the same crate, filter out the current crate when collecting spans to add to the context so we don't call extern_crate on the DefId of the current crate, which is meaningless and ICEs.

Produced output with this filter:

error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied
  --> y.rs:13:19
   |
13 |     check_trait::<foo::Struct>();
   |                   ^^^^^^^^^^^ the trait `Trait` is not implemented for `foo::Struct`
   |
note: there are multiple different versions of crate `foo` in the dependency graph
  --> y.rs:7:1
   |
4  | extern crate foo;
   | ----------------- one version of crate `foo` is used here, as a direct dependency of the current crate
5  |
6  | pub struct Struct;
   | ----------------- this type implements the required trait
7  | pub trait Trait {}
   | ^^^^^^^^^^^^^^^ this is the required trait
   |
  ::: x.rs:4:1
   |
4  | pub struct Struct;
   | ----------------- this type doesn't implement the required trait
5  | pub trait Trait {}
   | --------------- this is the found trait
   = note: two types coming from two different versions of the same crate are different types even if they look the same
   = help: you can use `cargo tree` to explore your dependency tree
note: required by a bound in `check_trait`
  --> y.rs:10:19
   |
10 | fn check_trait<T: Trait>() {}
   |                   ^^^^^ required by this bound in `check_trait`

Fix #133563.

When we encounter an error caused by traits/types of different versions of the same crate, filter out the current crate when collecting spans to add to the context so we don't call `extern_crate` on the `DefId` of the current crate, which is meaningless and ICEs. Produced output with this filter: ``` error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied --> y.rs:13:19 | 13 | check_trait::<foo::Struct>(); | ^^^^^^^^^^^ the trait `Trait` is not implemented for `foo::Struct` | note: there are multiple different versions of crate `foo` in the dependency graph --> y.rs:7:1 | 4 | extern crate foo; | ----------------- one version of crate `foo` is used here, as a direct dependency of the current crate 5 | 6 | pub struct Struct; | ----------------- this type implements the required trait 7 | pub trait Trait {} | ^^^^^^^^^^^^^^^ this is the required trait | ::: x.rs:4:1 | 4 | pub struct Struct; | ----------------- this type doesn't implement the required trait 5 | pub trait Trait {} | --------------- this is the found trait = note: two types coming from two different versions of the same crate are different types even if they look the same = help: you can use `cargo tree` to explore your dependency tree note: required by a bound in `check_trait` --> y.rs:10:19 | 10 | fn check_trait<T: Trait>() {} | ^^^^^ required by this bound in `check_trait` ``` Fix rust-lang#133563.

rustbot · 2024-11-28T17:56:51Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-11-28T17:56:53Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

estebank · 2024-11-28T18:21:20Z

We could also add some additional output mentioning that the current crate depends on a different version of itself, but I can't think of a good way of stating that and presumably that fact will be clear enough to the crate author that did that with the current output.

jieyouxu

Thanks, the suggestion looks good to me, r=me after a nit for the stderr snapshot handling.

tests/run-make/crate-loading-crate-depends-on-itself/rmake.rs

jieyouxu · 2024-11-29T06:49:46Z

@rustbot author

rustbot · 2024-11-29T18:43:54Z

The run-make-support library was changed

cc @jieyouxu

jieyouxu

Thanks, r=me once PR CI is green.

estebank · 2024-11-29T20:09:01Z

@bors r=jieyouxu

bors · 2024-11-29T20:09:04Z

📌 Commit 998ff2f has been approved by jieyouxu

It is now in the queue for this repository.

Do not call `extern_crate` on current trait on crate mismatch errors When we encounter an error caused by traits/types of different versions of the same crate, filter out the current crate when collecting spans to add to the context so we don't call `extern_crate` on the `DefId` of the current crate, which is meaningless and ICEs. Produced output with this filter: ``` error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied --> y.rs:13:19 | 13 | check_trait::<foo::Struct>(); | ^^^^^^^^^^^ the trait `Trait` is not implemented for `foo::Struct` | note: there are multiple different versions of crate `foo` in the dependency graph --> y.rs:7:1 | 4 | extern crate foo; | ----------------- one version of crate `foo` is used here, as a direct dependency of the current crate 5 | 6 | pub struct Struct; | ----------------- this type implements the required trait 7 | pub trait Trait {} | ^^^^^^^^^^^^^^^ this is the required trait | ::: x.rs:4:1 | 4 | pub struct Struct; | ----------------- this type doesn't implement the required trait 5 | pub trait Trait {} | --------------- this is the found trait = note: two types coming from two different versions of the same crate are different types even if they look the same = help: you can use `cargo tree` to explore your dependency tree note: required by a bound in `check_trait` --> y.rs:10:19 | 10 | fn check_trait<T: Trait>() {} | ^^^^^ required by this bound in `check_trait` ``` Fix rust-lang#133563.

Rollup of 10 pull requests Successful merges: - rust-lang#116161 (Stabilize `extended_varargs_abi_support`) - rust-lang#132750 ([AIX] handle libunwind native_libs) - rust-lang#133488 (tests: Add regression test for self referential structs with cow as last field) - rust-lang#133569 (Bump `ruzstd` to 0.7.3) - rust-lang#133585 (Do not call `extern_crate` on current trait on crate mismatch errors) - rust-lang#133587 (Fix target_feature handling in freg of LoongArch inline assembly) - rust-lang#133599 (Add `+forced-atomics` feature to esp32s2 no_std target) - rust-lang#133620 (Simplify hir_typeck_pass_to_variadic_function) - rust-lang#133623 (Improve span handling in `parse_expr_bottom`.) - rust-lang#133625 (custom MIR: add doc comment for debuginfo) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#133585 - estebank:issue-133563, r=jieyouxu Do not call `extern_crate` on current trait on crate mismatch errors When we encounter an error caused by traits/types of different versions of the same crate, filter out the current crate when collecting spans to add to the context so we don't call `extern_crate` on the `DefId` of the current crate, which is meaningless and ICEs. Produced output with this filter: ``` error[E0277]: the trait bound `foo::Struct: Trait` is not satisfied --> y.rs:13:19 | 13 | check_trait::<foo::Struct>(); | ^^^^^^^^^^^ the trait `Trait` is not implemented for `foo::Struct` | note: there are multiple different versions of crate `foo` in the dependency graph --> y.rs:7:1 | 4 | extern crate foo; | ----------------- one version of crate `foo` is used here, as a direct dependency of the current crate 5 | 6 | pub struct Struct; | ----------------- this type implements the required trait 7 | pub trait Trait {} | ^^^^^^^^^^^^^^^ this is the required trait | ::: x.rs:4:1 | 4 | pub struct Struct; | ----------------- this type doesn't implement the required trait 5 | pub trait Trait {} | --------------- this is the found trait = note: two types coming from two different versions of the same crate are different types even if they look the same = help: you can use `cargo tree` to explore your dependency tree note: required by a bound in `check_trait` --> y.rs:10:19 | 10 | fn check_trait<T: Trait>() {} | ^^^^^ required by this bound in `check_trait` ``` Fix rust-lang#133563.

compiler-errors · 2024-12-23T22:56:37Z

Beta nominating due to #134705

rustbot assigned jieyouxu Nov 28, 2024

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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. labels Nov 28, 2024

jieyouxu approved these changes Nov 29, 2024

View reviewed changes

tests/run-make/crate-loading-crate-depends-on-itself/rmake.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 29, 2024

Use rmake diff output in test

e97e15d

jieyouxu approved these changes Nov 29, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Move the crate-loading test to use diff output

998ff2f

estebank force-pushed the issue-133563 branch from 72572c7 to 998ff2f Compare November 29, 2024 18:59

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 29, 2024

This was referenced Nov 30, 2024

Rollup of 9 pull requests #133657

Closed

Rollup of 10 pull requests #133658

Merged

bors merged commit 70e71f5 into rust-lang:master Nov 30, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Nov 30, 2024

compiler-errors mentioned this pull request Dec 23, 2024

regression: ICE: tcx.extern_crate(LocalCrate) is not supported for this key #134705

Open

compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Do not call `extern_crate` on current trait on crate mismatch errors #133585

Do not call `extern_crate` on current trait on crate mismatch errors #133585

estebank commented Nov 28, 2024

rustbot commented Nov 28, 2024

rustbot commented Nov 28, 2024

estebank commented Nov 28, 2024

jieyouxu left a comment •

edited

Loading

jieyouxu commented Nov 29, 2024

rustbot commented Nov 29, 2024

jieyouxu left a comment

This comment has been minimized.

estebank commented Nov 29, 2024

bors commented Nov 29, 2024

compiler-errors commented Dec 23, 2024

Do not call extern_crate on current trait on crate mismatch errors #133585

Do not call extern_crate on current trait on crate mismatch errors #133585

Conversation

estebank commented Nov 28, 2024

rustbot commented Nov 28, 2024

rustbot commented Nov 28, 2024

estebank commented Nov 28, 2024

jieyouxu left a comment • edited Loading

Choose a reason for hiding this comment

jieyouxu commented Nov 29, 2024

rustbot commented Nov 29, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

This comment has been minimized.

estebank commented Nov 29, 2024

bors commented Nov 29, 2024

compiler-errors commented Dec 23, 2024

Do not call `extern_crate` on current trait on crate mismatch errors #133585

Do not call `extern_crate` on current trait on crate mismatch errors #133585

jieyouxu left a comment •

edited

Loading