[beta] Backport two changes to 1.39.0 #7424
Merged
Conversation
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
Integration tests were waiting for binaries to finish building due to a minor logic error.
Fixes an accidental regression from rust-lang#7084 where `--features a b` was erroneously mistinterpreted as `--features "a b"`. Closes rust-lang#7418
|
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
the
S-waiting-on-review
|
r? @ehuss |
|
@bors r+ |
|
📌 Commit f393130 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Sep 25, 2019
2 commits in b6c6f685b38d523580813b0031677c2298f458ea..4b105b6abfb12d6985ffe66670e8b2a85982291a 2019-09-19 21:10:09 +0000 to 2019-09-25 17:26:54 +0000 - [beta] Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7430) - [beta] Backport two changes to 1.39.0 (rust-lang/cargo#7424)
Mark-Simulacrum
pushed a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Sep 26, 2019
2 commits in b6c6f685b38d523580813b0031677c2298f458ea..4b105b6abfb12d6985ffe66670e8b2a85982291a 2019-09-19 21:10:09 +0000 to 2019-09-25 17:26:54 +0000 - [beta] Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7430) - [beta] Backport two changes to 1.39.0 (rust-lang/cargo#7424)
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.
This is a backport of:
--features a bon the CLI #7419