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

Fix check_for_file_and_add's check for conflict file #12135

Merged
merged 2 commits into from
May 15, 2023
Merged

Fix check_for_file_and_add's check for conflict file #12135

merged 2 commits into from
May 15, 2023

Conversation

eval-exec
Copy link
Contributor

@eval-exec eval-exec commented May 13, 2023 •
edited
Loading

What does this PR try to resolve?

Fixes #12127

How should we test and review this PR?

  • two unit tests

@rustbot
Copy link
Collaborator

rustbot commented May 13, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @weihanglo (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2023
@eval-exec eval-exec force-pushed the fix-check_for_file_and_add branch from 294bd92 to 5e01bc8 Compare May 13, 2023 04:30
@eval-exec eval-exec marked this pull request as draft May 13, 2023 04:30
weihanglo
weihanglo reviewed May 13, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Please refer to this chapter regarding writing tests in Cargo.

For how to review and test your change on our side, it needn't be too complicated. You can either write down steps of doing a manual test, or how to understand each commits.

@eval-exec
Fix check_for_file_and_add's check for conflict file
1dde1e1 
Signed-off-by: Eval EXEC <execvy@gmail.com>
@eval-exec eval-exec force-pushed the fix-check_for_file_and_add branch from 5e01bc8 to 1dde1e1 Compare May 14, 2023 07:13
@eval-exec eval-exec marked this pull request as ready for review May 14, 2023 08:50
@eval-exec eval-exec mentioned this pull request May 14, 2023
Closed
@eval-exec
Add test case for confilict README.md check
e906797 
Signed-off-by: Eval EXEC <execvy@gmail.com>
@eval-exec eval-exec force-pushed the fix-check_for_file_and_add branch from 543847d to e906797 Compare May 14, 2023 08:56
weihanglo
weihanglo approved these changes May 15, 2023
View reviewed changes
Copy link
Member

@weihanglo weihanglo 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 for the quick fix!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 15, 2023

📌 Commit e906797 has been approved by weihanglo

It is now in the queue for this repository.

@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 May 15, 2023
@bors
Copy link
Contributor

bors commented May 15, 2023

⌛ Testing commit e906797 with merge f05ca4f...

@bors
Copy link
Contributor

bors commented May 15, 2023

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing f05ca4f to master...

@bors bors merged commit f05ca4f into rust-lang:master May 15, 2023
@weihanglo weihanglo mentioned this pull request May 17, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 17, 2023
@bors
Auto merge of rust-lang#111664 - weihanglo:update-cargo, r=weihanglo
c0784db 
Update cargo

8 commits in 13413c64ff88dd6c2824e9eb9374fc5f10895d28..09276c703a473ab33daaeb94917232e80eefd628
2023-05-10 13:46:18 +0000 to 2023-05-16 21:43:35 +0000
- docs: Clarify that crates.io doesn't link to docs.rs right away. (rust-lang/cargo#12146)
- docs(ref): Clarify MSRV is generally minor (rust-lang/cargo#12122)
- Fix `check_for_file_and_add`'s check for conflict file (rust-lang/cargo#12135)
- Fixes: Incorrect document link (rust-lang/cargo#12143)
- doc: intra-doc links and doc comments for build script (rust-lang/cargo#12133)
- Add Cargo team charter. (rust-lang/cargo#12010)
- Remove useless drop of copy type (rust-lang/cargo#12136)
- Fix dep/feat syntax with hidden implicit optional dependencies (rust-lang/cargo#12130)

r? ghost
@ehuss ehuss added this to the 1.71.0 milestone May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

Labels
Command-package 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.71.0
Development

Successfully merging this pull request may close these issues.

Incorrect warning about README outside package
5 participants
@eval-exec @rustbot @weihanglo @bors @ehuss