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.

Sign up for GitHub

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

Jump to bottom

Warning when using features in patch #9666

Merged
merged 2 commits into from
Jul 9, 2021
Merged

Warning when using features in patch #9666

merged 2 commits into from
Jul 9, 2021

Conversation

Rustin170506
Copy link
Member

part of #3034

@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 Jul 8, 2021
ehuss
ehuss reviewed Jul 8, 2021
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

tests/testsuite/patch.rs Outdated Show resolved Hide resolved
tests/testsuite/patch.rs Outdated Show resolved Hide resolved
@Rustin170506
Remove unrelated cases
a846226 
Signed-off-by: hi-rustin <[email protected]>
@Rustin170506 Rustin170506 requested a review from ehuss July 9, 2021 05:16
@ehuss
Copy link
Contributor

ehuss commented Jul 9, 2021

Thanks!

@bors r

@bors
Copy link
Collaborator

bors commented Jul 9, 2021

📌 Commit a846226 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 Jul 9, 2021
@bors
Copy link
Collaborator

bors commented Jul 9, 2021

⌛ Testing commit a846226 with merge 18f2598...

@bors
Copy link
Collaborator

bors commented Jul 9, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 18f2598 to master...

@bors bors merged commit 18f2598 into rust-lang:master Jul 9, 2021
@ehuss ehuss mentioned this pull request Jul 15, 2021
Merged
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 15, 2021
@JohnTitor
Rollup merge of rust-lang#87147 - ehuss:update-cargo, r=ehuss
3917c33 
Update cargo

13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac
2021-07-02 20:35:38  0000 to 2021-07-14 20:54:28  0000
- Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663)
- Prefer patched versions of dependencies (rust-lang/cargo#9639)
- When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686)
- Spot the crate typo easily (rust-lang/cargo#9665)
- remove unnecessary 'collect' (rust-lang/cargo#9616)
- Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679)
- Serialize `cargo fix` (rust-lang/cargo#9677)
- Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658)
- Update nightly failure notification. (rust-lang/cargo#9657)
- Update Windows env uppercase key check. (rust-lang/cargo#9654)
- Unignore fix_edition_2021. (rust-lang/cargo#9662)
- Warning when using features in patch (rust-lang/cargo#9666)
- Unify cargo and rustc's error reporting (rust-lang/cargo#9655)
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 15, 2021
@JohnTitor
Rollup merge of rust-lang#87147 - ehuss:update-cargo, r=ehuss
6e785f9 
Update cargo

13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac
2021-07-02 20:35:38  0000 to 2021-07-14 20:54:28  0000
- Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663)
- Prefer patched versions of dependencies (rust-lang/cargo#9639)
- When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686)
- Spot the crate typo easily (rust-lang/cargo#9665)
- remove unnecessary 'collect' (rust-lang/cargo#9616)
- Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679)
- Serialize `cargo fix` (rust-lang/cargo#9677)
- Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658)
- Update nightly failure notification. (rust-lang/cargo#9657)
- Update Windows env uppercase key check. (rust-lang/cargo#9654)
- Unignore fix_edition_2021. (rust-lang/cargo#9662)
- Warning when using features in patch (rust-lang/cargo#9666)
- Unify cargo and rustc's error reporting (rust-lang/cargo#9655)
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 15, 2021
@JohnTitor
Rollup merge of rust-lang#87147 - ehuss:update-cargo, r=ehuss
20b363c 
Update cargo

13 commits in 3ebb5f15a940810f250b68821149387af583a79e..66a6737a0c9f3a974af2dd032a65d3e409c77aac
2021-07-02 20:35:38  0000 to 2021-07-14 20:54:28  0000
- Add format option to `cargo tree` to print the lib_name (rust-lang/cargo#9663)
- Prefer patched versions of dependencies (rust-lang/cargo#9639)
- When a dependency does not have a version, git or path, fails directly (rust-lang/cargo#9686)
- Spot the crate typo easily (rust-lang/cargo#9665)
- remove unnecessary 'collect' (rust-lang/cargo#9616)
- Make it easier to run testsuite with a custom toolchain. (rust-lang/cargo#9679)
- Serialize `cargo fix` (rust-lang/cargo#9677)
- Don't recommend filing issues on rust-lang/cargo for Cargo.toml errors. (rust-lang/cargo#9658)
- Update nightly failure notification. (rust-lang/cargo#9657)
- Update Windows env uppercase key check. (rust-lang/cargo#9654)
- Unignore fix_edition_2021. (rust-lang/cargo#9662)
- Warning when using features in patch (rust-lang/cargo#9666)
- Unify cargo and rustc's error reporting (rust-lang/cargo#9655)
@Rustin170506 Rustin170506 deleted the rustin-patch-warn branch August 5, 2021 08:46
@Rustin170506 Rustin170506 mentioned this pull request Aug 5, 2021
Merged
@ehuss ehuss added this to the 1.55.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehuss ehuss Awaiting requested review from ehuss

Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.55.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Rustin170506 @rust-highfive @ehuss @bors @alexcrichton