-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Do not call extern_crate
on current trait on crate mismatch errors
#133585
Open
estebank
wants to merge
1
commit into
rust-lang:master
Choose a base branch
from
estebank:issue-133563
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+56
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
tests/run-make/crate-loading-crate-depends-on-itself/foo-current.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
#![crate_type = "lib"] | ||
#![crate_name = "foo"] | ||
|
||
extern crate foo; | ||
|
||
pub struct Struct; | ||
pub trait Trait {} | ||
impl Trait for Struct {} | ||
|
||
fn check_trait<T: Trait>() {} | ||
|
||
fn ice() { | ||
check_trait::<foo::Struct>(); | ||
} |
6 changes: 6 additions & 0 deletions
6
tests/run-make/crate-loading-crate-depends-on-itself/foo-prev.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#![crate_type = "lib"] | ||
#![crate_name = "foo"] | ||
|
||
pub struct Struct; | ||
pub trait Trait {} | ||
impl Trait for Struct {} |
32 changes: 32 additions & 0 deletions
32
tests/run-make/crate-loading-crate-depends-on-itself/rmake.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
//@ only-linux | ||
//@ ignore-wasm32 | ||
//@ ignore-wasm64 | ||
// ignore-tidy-linelength | ||
|
||
// Verify that if the current crate depends on a different version of the same crate, *and* types | ||
// and traits of the different versions are mixed, we produce diagnostic output and not an ICE. | ||
// #133563 | ||
|
||
use run_make_support::{rust_lib_name, rustc}; | ||
|
||
fn main() { | ||
rustc().input("foo-prev.rs").run(); | ||
|
||
rustc() | ||
.extra_filename("current") | ||
.metadata("current") | ||
.input("foo-current.rs") | ||
.extern_("foo", rust_lib_name("foo")) | ||
.run_fail() | ||
.assert_stderr_contains(r#" | ||
note: there are multiple different versions of crate `foo` in the dependency graph | ||
--> foo-current.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"#); | ||
} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: can you pull this stderr snapshot into a separate
.stderr
file, then usediff()
to compare rustc's stderr output versus the reference.stderr
snapshot? This is so that the stderr snapshot can be blessed via./x test tests/run-make/crate-loading... --bless
through thediff()
logic.Example
diff()
usage: https://github.com/rust-lang/rust/blob/d6f88291f3ce96375683acc62d54710add042f98/tests/run-make/rustc-help/rmake.rs