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

Document -Zpatch-in-config #9270

Merged
merged 3 commits into from
Mar 15, 2021
Merged

Conversation

jonhoo
Copy link
Contributor

@jonhoo jonhoo commented Mar 15, 2021

Tracking issue: #9269

@rust-highfive
Copy link

r? @alexcrichton

(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 Mar 15, 2021
@ehuss
Copy link
Contributor

ehuss commented Mar 15, 2021

Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2021

📌 Commit 81116a9 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 Mar 15, 2021
@bors
Copy link
Collaborator

bors commented Mar 15, 2021

⌛ Testing commit 81116a9 with merge 9d1fe7efe321f7f7da699d69bb238799380dc2d2...

@bors
Copy link
Collaborator

bors commented Mar 15, 2021

💥 Test timed out

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

ehuss commented Mar 15, 2021

@bors retry
CI never started

@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 Mar 15, 2021
@bors
Copy link
Collaborator

bors commented Mar 15, 2021

⌛ Testing commit 81116a9 with merge 434be94...

@jonhoo
Copy link
Contributor Author

jonhoo commented Mar 15, 2021

@ehuss Forgot the CLI help text; posted in #9271

@bors
Copy link
Collaborator

bors commented Mar 15, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 434be94 to master...

@bors bors merged commit 434be94 into rust-lang:master Mar 15, 2021
@jonhoo jonhoo deleted the document-patch-in-config branch March 16, 2021 00:08
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Mar 17, 2021
Update cargo

8 commits in 32da9eaa5de5be241cf8096ca6b749a157194f77..90691f2bfe9a50291a98983b1ed2feab51d5ca55
2021-03-13 01:18:40 +0000 to 2021-03-16 21:36:55 +0000
- Add report if `cargo fix --edition` changes features. (rust-lang/cargo#9268)
- Fix --feature pkg/feat for V1 resolver for non-member. (rust-lang/cargo#9275)
- Fix doc duplicate removal of root units. (rust-lang/cargo#9276)
- Add CLI help text for patch-in-config (rust-lang/cargo#9271)
- Document `-Zpatch-in-config` (rust-lang/cargo#9270)
- Support [patch] in .cargo/config files (rust-lang/cargo#9204)
- Add `--future-incompat-report` support to `cargo test` (rust-lang/cargo#9264)
- 🍱 Crop favicon (rust-lang/cargo#9262)
@ehuss ehuss added this to the 1.52.0 milestone 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.

5 participants