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.

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

Update mailmap #115702

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Update mailmap #115702

merged 1 commit into from
Sep 11, 2023

Conversation

jonas-schievink
Copy link
Contributor

@rustbot
Copy link
Collaborator

rustbot commented Sep 9, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 9, 2023
@jhpratt
Copy link
Member

jhpratt commented Sep 10, 2023

For the purposes of rust-lang/thanks#58, I think it would be better if there were something differentiating different people. So "ghost1" for the email, for example. This avoids merging people that aren't actually the same person.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 11, 2023

This avoids merging people that aren't actually the same person.

I think that's fine. Just like github merges all deleted accounts to @ghost

r? @oli-obk

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 11, 2023

📌 Commit 8488c27 has been approved by oli-obk

It is now in the queue for this repository.

@rustbot rustbot assigned oli-obk and unassigned Mark-Simulacrum Sep 11, 2023
@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 Sep 11, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 11, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Sep 11, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 11, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#115335 (fix overflow in array length computation)
 - rust-lang#115440 (bootstrap/format: remove unnecessary paths.push)
 - rust-lang#115702 (Update mailmap)
 - rust-lang#115734 (Use no_core for KCFI tests to exercise them in CI)
 - rust-lang#115739 (Call `LateLintPass::check_attribute` from `with_lint_attrs`)
 - rust-lang#115743 (Point out if a local trait has no implementations)
 - rust-lang#115744 (Improve diagnostic for generic params from outer items (E0401))

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 11, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#115308 (suggest iter_mut() where trying to modify elements from .iter())
 - rust-lang#115595 (Fix incorrect mutable suggestion information for binding in ref pattern like:  `let &b = a;` )
 - rust-lang#115702 (Update mailmap)
 - rust-lang#115708 (fix homogeneous_aggregate not ignoring some ZST)
 - rust-lang#115739 (Call `LateLintPass::check_attribute` from `with_lint_attrs`)
 - rust-lang#115743 (Point out if a local trait has no implementations)
 - rust-lang#115744 (Improve diagnostic for generic params from outer items (E0401))

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt
Copy link
Member

jhpratt commented Sep 11, 2023

@oli-obk The reason I say that is because it would affect rankings and whatnot.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 11, 2023

We could stop showing Ghost at all in the rankings

@jhpratt
Copy link
Member

jhpratt commented Sep 11, 2023

I initially considered that, but that as well is objectively incorrect. There is a person associated with it; they just don't want their name shown any more.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 11, 2023

hmm... I did not consider that. I don't know what the right thing to do here is, but I also personally don't like the rankings anyway, so I should not really be part of the discussion of details.

For now it doesn't matter as we only have a single Ghost entry. We can start coming up with a new policy or just start numbering them as they come.

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 11, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#115335 (fix overflow in array length computation)
 - rust-lang#115440 (bootstrap/format: remove unnecessary paths.push)
 - rust-lang#115702 (Update mailmap)
 - rust-lang#115727 (Implement fallback for effect param)
 - rust-lang#115739 (Call `LateLintPass::check_attribute` from `with_lint_attrs`)
 - rust-lang#115743 (Point out if a local trait has no implementations)
 - rust-lang#115744 (Improve diagnostic for generic params from outer items (E0401))
 - rust-lang#115752 (rustdoc: Add missing "Aliased type" title in the sidebar)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f30b27a into rust-lang:master Sep 11, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 11, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 11, 2023
Rollup merge of rust-lang#115702 - jonas-schievink:update-mailmap, r=oli-obk

Update mailmap

rust-lang/team#1071 / rust-lang/thanks#58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants