Skip to content

Get rid of some unused dependecies #6912

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

Merged
merged 1 commit into from
Mar 16, 2021
Merged

Conversation

flip1995
Copy link
Member

changelog: none

@rust-highfive
Copy link

r? @Manishearth

(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
@flip1995
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Mar 15, 2021

⌛ Trying commit 54676e5 with merge 7900993...

bors added a commit that referenced this pull request Mar 15, 2021
Get rid of some unused dependecies

changelog: none
@bors
Copy link
Contributor

bors commented Mar 15, 2021

☀️ Try build successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Build commit: 7900993 (7900993720c2db5e3c159bc0eea16bf2b399fde8)

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 15, 2021

📌 Commit 54676e5 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Mar 15, 2021

☔ The latest upstream changes (presumably #6907) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Mar 15, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout dep-cleanup (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self dep-cleanup --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging clippy_utils/src/lib.rs
CONFLICT (content): Merge conflict in clippy_utils/src/lib.rs
Automatic merge failed; fix conflicts and then commit the result.

@flip1995
Copy link
Member Author

@bors r=Manishearth (just rebased the branch)

@bors
Copy link
Contributor

bors commented Mar 16, 2021

📌 Commit bdf2dce has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Mar 16, 2021

⌛ Testing commit bdf2dce with merge 5b3e61d...

@bors
Copy link
Contributor

bors commented Mar 16, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Manishearth
Pushing 5b3e61d to master...

@bors bors merged commit 5b3e61d into rust-lang:master Mar 16, 2021
@flip1995 flip1995 deleted the dep-cleanup branch March 16, 2021 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants