Don't try to parse MSRV if feature is not enabled #9115
Merged
Conversation
This file contains hidden or 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
|
r? @ehuss (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
Yea, I think for the test the following change should be sufficient: diff --git a/tests/testsuite/rust_version.rs b/tests/testsuite/rust_version.rs
index b3d4353bb..7792cbee1 100644
--- a/tests/testsuite/rust_version.rs
+++ b/tests/testsuite/rust_version.rs
@@ -11,7 +11,7 @@ fn rust_version_gated() {
[package]
name = "foo"
version = "0.0.1"
- rust-version = "1.17"
+ rust-version = "1.9999"
"#,
)
.file("src/lib.rs", "")
@@ -31,7 +31,7 @@ fn rust_version_gated() {
[package]
name = "foo"
version = "0.0.1"
- rust-version = "1.17"
+ rust-version = "1.9999"
"#,
)
.file("src/lib.rs", "") |
djc
force-pushed
the
fix-msrv-handling
branch
from
e986540 to
040d27f
Compare
|
Thanks! @bors r+ |
|
📌 Commit 040d27f has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 2, 2021
Update cargo 5 commits in c3abcfe8a75901c7c701557a728941e8fb19399e..e099df243bb2495b9b197f79c19f124032b1e778 2021-01-25 16:16:43 +0000 to 2021-02-01 16:24:34 +0000 - Impl warn for locked install without Cargo.lock (rust-lang/cargo#9108) - Document -Z extra-link-arg. (rust-lang/cargo#9121) - Flip 'foo' and 'bar' to be consistent (rust-lang/cargo#9120) - Don't try to parse MSRV if feature is not enabled (rust-lang/cargo#9115) - simplify char range check (rust-lang/cargo#9110)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@ehuss is something like this what you had in mind? Should we add tests to make sure this works correctly?