-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #12799 - marchiore:warn_add_package_name, r=epage
feat: add package name and version to warning messages ### What does this PR try to resolve? Hi, this PR Fixes #8018, where i add the package name and version on warning messages. As this is my first contribution to the project, if anything is not in compliance in the PR let me know and I will be happy to correct it.
- Loading branch information
Showing
6 changed files
with
17 additions
and
14 deletions.
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
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 |
---|---|---|
|
@@ -3778,8 +3778,8 @@ fn warnings_emitted() { | |
[COMPILING] foo v0.5.0 ([..]) | ||
[RUNNING] `rustc [..]` | ||
[RUNNING] `[..]` | ||
warning: foo | ||
warning: bar | ||
warning: foo@0.5.0: foo | ||
warning: [email protected]: bar | ||
[RUNNING] `rustc [..]` | ||
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] | ||
", | ||
|
@@ -3816,7 +3816,7 @@ fn warnings_emitted_when_build_script_panics() { | |
p.cargo("build") | ||
.with_status(101) | ||
.with_stdout("") | ||
.with_stderr_contains("warning: foo\nwarning: bar") | ||
.with_stderr_contains("warning: foo@0.5.0: foo\nwarning: [email protected]: bar") | ||
.run(); | ||
} | ||
|
||
|
@@ -3929,8 +3929,8 @@ fn warnings_printed_on_vv() { | |
[COMPILING] bar v0.1.0 | ||
[RUNNING] `[..] rustc [..]` | ||
[RUNNING] `[..]` | ||
warning: foo | ||
warning: bar | ||
warning: [email protected]: foo | ||
warning: bar@0.1.0: bar | ||
[RUNNING] `[..] rustc [..]` | ||
[COMPILING] foo v0.5.0 ([..]) | ||
[RUNNING] `[..] rustc [..]` | ||
|
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 |
---|---|---|
|
@@ -137,12 +137,12 @@ fn rustc_bootstrap() { | |
// NOTE: uses RUSTC_BOOTSTRAP so it will be propagated to rustc | ||
// (this matters when tests are being run with a beta or stable cargo) | ||
.env("RUSTC_BOOTSTRAP", "1") | ||
.with_stderr_contains("warning: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.with_stderr_contains("warning: [email protected]: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.run(); | ||
// RUSTC_BOOTSTRAP set to the name of the library should warn | ||
p.cargo("check") | ||
.env("RUSTC_BOOTSTRAP", "has_dashes") | ||
.with_stderr_contains("warning: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.with_stderr_contains("warning: [email protected]: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.run(); | ||
// RUSTC_BOOTSTRAP set to some random value should error | ||
p.cargo("check") | ||
|
@@ -169,7 +169,7 @@ fn rustc_bootstrap() { | |
// NOTE: uses RUSTC_BOOTSTRAP so it will be propagated to rustc | ||
// (this matters when tests are being run with a beta or stable cargo) | ||
.env("RUSTC_BOOTSTRAP", "1") | ||
.with_stderr_contains("warning: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.with_stderr_contains("warning: [email protected]: Cannot set `RUSTC_BOOTSTRAP=1` [..]") | ||
.run(); | ||
// RUSTC_BOOTSTRAP conditionally set when there's no library should error (regardless of the value) | ||
p.cargo("check") | ||
|
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 |
---|---|---|
|
@@ -204,7 +204,7 @@ fn cdylib_link_arg_transitive() { | |
[COMPILING] bar v1.0.0 [..] | ||
[RUNNING] `rustc --crate-name build_script_build bar/build.rs [..] | ||
[RUNNING] `[..]build-script-build[..] | ||
warning: cargo:rustc-link-arg-cdylib was specified in the build script of bar v1.0.0 \ | ||
warning: [email protected]: cargo:rustc-link-arg-cdylib was specified in the build script of bar v1.0.0 \ | ||
([ROOT]/foo/bar), but that package does not contain a cdylib target | ||
Allowing this was an unintended change in the 1.50 release, and may become an error in \ | ||
|
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 |
---|---|---|
|
@@ -1807,7 +1807,7 @@ fn shared_dep_same_but_dependencies() { | |
[COMPILING] dep [..] | ||
[COMPILING] bin2 [..] | ||
[COMPILING] bin1 [..] | ||
warning: feat: enabled | ||
warning: [email protected]: feat: enabled | ||
[FINISHED] [..] | ||
", | ||
) | ||
|
@@ -1823,7 +1823,7 @@ warning: feat: enabled | |
[FRESH] subdep [..] | ||
[FRESH] dep [..] | ||
[FRESH] bin1 [..] | ||
warning: feat: enabled | ||
warning: [email protected]: feat: enabled | ||
[FRESH] bin2 [..] | ||
[FINISHED] [..] | ||
", | ||
|
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 |
---|---|---|
|
@@ -105,7 +105,7 @@ fn warning_on_lib_failure() { | |
.with_stderr_contains("[UPDATING] `[..]` index") | ||
.with_stderr_contains("[DOWNLOADED] bar v0.0.1 ([..])") | ||
.with_stderr_contains("[COMPILING] bar v0.0.1") | ||
.with_stderr_contains(&format!("[WARNING] {}", WARNING1)) | ||
.with_stderr_contains(&format!("[WARNING] {}", WARNING2)) | ||
.with_stderr_contains(&format!("[WARNING] [email protected]: {}", WARNING1)) | ||
.with_stderr_contains(&format!("[WARNING] [email protected]: {}", WARNING2)) | ||
.run(); | ||
} |