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 some mailmap entries #67664

Merged
merged 3 commits into from
Dec 28, 2019
Merged

Fix some mailmap entries #67664

merged 3 commits into from
Dec 28, 2019

Conversation

Manishearth
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 27, 2019
mati865
mati865 reviewed Dec 27, 2019
View reviewed changes
.mailmap Outdated
Nika Layzell <michael@thelayzells.com>
Nif Ward <nif.ward@gmail.com>
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep alphabetical order.

@mati865
Copy link
Contributor

mati865 commented Dec 27, 2019

cc @Mark-Simulacrum #67663

@Manishearth Manishearth mentioned this pull request Dec 27, 2019
Closed
@pietroalbini
Copy link
Member

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 27, 2019

📌 Commit e518e38 has been approved by Mark-Simulacrum

@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 Dec 27, 2019
@pietroalbini
Copy link
Member

@bors rollup

oli-obk added a commit to oli-obk/rust that referenced this pull request Dec 27, 2019
@oli-obk
Rollup merge of rust-lang#67664 - Manishearth:mailmapfixes, r=Mark-Si…
65bbcf0 
…mulacrum

Fix some mailmap entries

r? @pietroalbini
@oli-obk oli-obk mentioned this pull request Dec 27, 2019
Merged
bors added a commit that referenced this pull request Dec 28, 2019
@bors
Auto merge of #67670 - oli-obk:rollup-2dp08sd, r=oli-obk
3a087ad 
Rollup of 15 pull requests

Successful merges:

 - #65244 (add IntoFuture trait and support for await)
 - #67576 (reuse `capacity` variable in slice::repeat)
 - #67588 (Use NonNull in slice::Iter and slice::IterMut.)
 - #67594 (Update libc to 0.2.66)
 - #67602 (Use issue = "none" instead of "0" in intrinsics)
 - #67604 (Add Scalar::to_(u|i)16 methods)
 - #67617 (Remove `compiler_builtins_lib` documentation)
 - #67621 (Use the correct type for static qualifs)
 - #67629 (Remove redundant link texts)
 - #67632 (Convert collapsed to shortcut reference links)
 - #67633 (Update .mailmap)
 - #67635 (Document safety of Path casting)
 - #67654 (Add regression test for old NLL ICE)
 - #67659 (Stabilize the `matches!` macro)
 - #67664 (Fix some mailmap entries)

Failed merges:

r? @ghost
@bors bors merged commit e518e38 into rust-lang:master Dec 28, 2019
@Manishearth Manishearth deleted the mailmapfixes branch July 18, 2020 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mati865 mati865 mati865 left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

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.
6 participants
@Manishearth @mati865 @pietroalbini @Mark-Simulacrum @bors @rust-highfive