Skip to content
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

Fix interpretation of --features a b on the CLI #7419

Merged
merged 1 commit into from
Sep 24, 2019

Conversation

alexcrichton
Copy link
Member

Fixes an accidental regression from #7084 where --features a b was
erroneously mistinterpreted as --features "a b".

Closes #7418

@rust-highfive
Copy link

r? @ehuss

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2019
@alexcrichton
Copy link
Member Author

While technically a regression from stable to beta so we should backport, the stable release is going out this week so it's probably fine to just regress for one cycle.

@ehuss
Copy link
Contributor

ehuss commented Sep 24, 2019

I think it would be good to backport this to 1.39 (so only 1.38 will be affected). I'd also like to backport #7394 to 1.39, too!

Fixes an accidental regression from rust-lang#7084 where `--features a b` was
erroneously mistinterpreted as `--features "a b"`.

Closes rust-lang#7418
@alexcrichton alexcrichton force-pushed the fix-features-regression branch from d14fe41 to 1fa02e7 Compare September 24, 2019 16:24
@alexcrichton
Copy link
Member Author

1.39.0 has now been branched, so I'll send a backport for this once it lands (and can include #7394 too)

@ehuss
Copy link
Contributor

ehuss commented Sep 24, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 24, 2019

📌 Commit 1fa02e7 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 24, 2019
@bors
Copy link
Contributor

bors commented Sep 24, 2019

⌛ Testing commit 1fa02e7 with merge aa6b7e0...

bors added a commit that referenced this pull request Sep 24, 2019
Fix interpretation of `--features a b` on the CLI

Fixes an accidental regression from #7084 where `--features a b` was
erroneously mistinterpreted as `--features "a b"`.

Closes #7418
@bors
Copy link
Contributor

bors commented Sep 24, 2019

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing aa6b7e0 to master...

@bors bors merged commit 1fa02e7 into rust-lang:master Sep 24, 2019
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Sep 24, 2019
11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
- Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
- Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
- Update some unstable docs (rust-lang/cargo#7407)
- Fix xcompile tests. (rust-lang/cargo#7408)
- -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
- Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
- -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
- Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
- Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
- Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
- Extract Platform to a separate crate. (rust-lang/cargo#7375)
@alexcrichton alexcrichton deleted the fix-features-regression branch September 24, 2019 18:13
bors added a commit that referenced this pull request Sep 24, 2019
[beta] Backport two changes to 1.39.0

This is a backport of:

* #7394
* #7419
Centril added a commit to Centril/rust that referenced this pull request Sep 25, 2019
…tsakis

Update cargo

11 commits in b6c6f685b38d523580813b0031677c2298f458ea..aa6b7e01abce30091cc594cb23a15c46cead6e24
2019-09-19 21:10:09 +0000 to 2019-09-24 17:19:12 +0000
- Fix interpretation of `--features a b` on the CLI (rust-lang/cargo#7419)
- Update env_logger requirement from 0.6.0 to 0.7.0 (rust-lang/cargo#7422)
- Update some unstable docs (rust-lang/cargo#7407)
- Fix xcompile tests. (rust-lang/cargo#7408)
- -Ztimings: Fix more scale problems. (rust-lang/cargo#7403)
- Fix some rendering issues with -Ztimings. (rust-lang/cargo#7397)
- -Ztimings: show max jobs/cpus (rust-lang/cargo#7398)
- Fix -Ztimings with doc tests. (rust-lang/cargo#7395)
- Add documentation for the -Zdoctest-xcompile feature (rust-lang/cargo#7391)
- Fix integration tests waiting for binaries to finish. (rust-lang/cargo#7394)
- Extract Platform to a separate crate. (rust-lang/cargo#7375)
@ehuss ehuss modified the milestones: 1.40.0, 1.39.0 Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Parsing of cargo run --features a b has regressed
4 participants