-
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 #10891 - joshtriplett:rust-version-recommend-precise, r…
…=ehuss Make the `rust-version` error recommend `cargo update --precise -p crate@ver` People encountering a dependency with a newer `rust-version` requirement may not know about `cargo update --precise`, or may consider alternate approaches that may be harmful (such as pinning with a `=` dependency). Provide specific guidance in the error message.
- Loading branch information
Showing
2 changed files
with
28 additions
and
3 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 |
---|---|---|
|
@@ -124,7 +124,7 @@ fn rust_version_too_high() { | |
.with_status(101) | ||
.with_stderr( | ||
"error: package `foo v0.0.1 ([..])` cannot be built because it requires \ | ||
rustc 1.9876.0 or newer, while the currently active rustc version is [..]", | ||
rustc 1.9876.0 or newer, while the currently active rustc version is [..]\n\n", | ||
) | ||
.run(); | ||
p.cargo("build --ignore-rust-version").run(); | ||
|
@@ -159,7 +159,10 @@ fn rust_version_dependency_fails() { | |
Downloading crates ...\n \ | ||
Downloaded bar v0.0.1 (registry `[..]`)\n\ | ||
error: package `bar v0.0.1` cannot be built because it requires \ | ||
rustc 1.2345.0 or newer, while the currently active rustc version is [..]", | ||
rustc 1.2345.0 or newer, while the currently active rustc version is [..]\n\ | ||
Either upgrade to rustc 1.2345.0 or newer, or use\n\ | ||
cargo update -p [email protected] --precise ver\n\ | ||
where `ver` is the latest version of `bar` supporting rustc [..]", | ||
) | ||
.run(); | ||
p.cargo("build --ignore-rust-version").run(); | ||
|