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

Add Yaah to clippy toolstain notification list #63989

Merged
merged 1 commit into from
Sep 10, 2019
Merged

Add Yaah to clippy toolstain notification list #63989

merged 1 commit into from
Sep 10, 2019

Conversation

yaahc
Copy link
Member

@yaahc yaahc commented Aug 29, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Aug 29, 2019
@yaahc
Copy link
Member Author

yaahc commented Aug 29, 2019

based on @Manishearth 's recommendation

@Centril
Copy link
Contributor

Centril commented Aug 29, 2019

r? @Centril @bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 29, 2019

📌 Commit 491d1c03cb51cc6299ec0f9b9e805b1d50db5c75 has been approved by Centril

@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 Aug 29, 2019
Manishearth
Manishearth approved these changes Aug 29, 2019
View reviewed changes
Copy link
Member

@Manishearth Manishearth left a comment

Choose a reason for hiding this comment

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

@bors delegate+

r=manishearth with that fixed

src/tools/publish_toolstate.py Outdated Show resolved Hide resolved
@Manishearth
Copy link
Member

@bors delegate+

@bors
Copy link
Contributor

bors commented Aug 29, 2019

✌️ @yaahc can now approve this pull request

@Centril Centril mentioned this pull request Aug 29, 2019
Merged
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 29, 2019

📌 Commit c5f8e00cbb1d7131ed2f2663956646d417b352d2 has been approved by Manishearth

bors added a commit that referenced this pull request Aug 29, 2019
@bors
Auto merge of #63990 - Centril:rollup-q1nt0b0, r=Centril
85ed538 
Rollup of 11 pull requests

Successful merges:

 - #63811 (Correctly suggest adding bounds to `impl Trait` argument)
 - #63933 (Resolve some small issues related to #63580)
 - #63938 (or-pattern: fix typo in error message)
 - #63945 (Recover `mut $pat` and other improvements)
 - #63958 (const_prop: only call error_to_const_error if we are actually showing something)
 - #63961 (Add Option<Span> to `require_lang_item`)
 - #63963 (remove the reference to __cxa_thread_atexit_impl)
 - #63965 (Prevent syntax error in LD linker version script)
 - #63968 (rustc_apfloat: make the crate #![no_std] explicitly.)
 - #63970 (Notify me (flip1995) when Clippy toolstate changes)
 - #63980 (add missing `#[repr(C)]` on the Slices union)

Failed merges:

 - #63989 (Add Yaah to clippy toolstain notification list)

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 29, 2019

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

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 29, 2019
@bors
Copy link
Contributor

bors commented Aug 31, 2019

🔒 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 master (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 master --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 src/tools/publish_toolstate.py
CONFLICT (content): Merge conflict in src/tools/publish_toolstate.py
Automatic merge failed; fix conflicts and then commit the result.

yaahc
yaahc commented Sep 2, 2019
View reviewed changes
src/tools/publish_toolstate.py Outdated Show resolved Hide resolved
@mati865
Copy link
Contributor

mati865 commented Sep 3, 2019

cc #64114

Maybe there should be separate notify array?

@pietroalbini
Copy link
Member

Tweaked permissions so any member of the clippy team can be assigned to rust-lang/rust issues.

@pietroalbini
Copy link
Member

Also opened a PR to add a CI check to ensure maintainers are assignable: #64119

@Centril
Copy link
Contributor

Centril commented Sep 10, 2019

r? @pietroalbini

@pietroalbini
Copy link
Member

@bors r=Manishearth rollup

@bors
Copy link
Contributor

bors commented Sep 10, 2019

📌 Commit 925a766 has been approved by Manishearth

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 10, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 10, 2019
@Centril
Rollup merge of rust-lang#63989 - yaahc:master, r=Manishearth
9eecb4a 
Add Yaah to clippy toolstain notification list
@Centril Centril mentioned this pull request Sep 10, 2019
Merged
bors added a commit that referenced this pull request Sep 10, 2019
@bors
Auto merge of #64354 - Centril:rollup-oaq0xoi, r=Centril
34e82a7 
Rollup of 8 pull requests

Successful merges:

 - #63786 (Make `abs`, `wrapping_abs`, `overflowing_abs` const functions)
 - #63989 (Add Yaah to clippy toolstain notification list)
 - #64256 (test/c-variadic: Fix patterns on powerpc64)
 - #64292 (lowering: extend temporary lifetimes around await)
 - #64311 (lldb: avoid mixing "Hit breakpoint" message with other output.)
 - #64330 (Clarify E0507 to note Fn/FnMut relationship to borrowing)
 - #64331 (Changed instant is earlier to instant is later)
 - #64344 (rustc_mir: buffer -Zdump-mir output instead of pestering the kernel constantly.)

Failed merges:

r? @ghost
@bors bors merged commit 925a766 into rust-lang:master Sep 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

@Manishearth Manishearth Manishearth approved these changes

Assignees

@pietroalbini pietroalbini

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
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@yaahc @rust-highfive @Centril @bors @Manishearth @mati865 @pietroalbini @nikomatsakis