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

Add more mailmap entries #132474

Merged
merged 1 commit into from
Jan 1, 2025
Merged

Conversation

Noratrieb
Copy link
Member

@Noratrieb Noratrieb commented Nov 1, 2024

If you have been pinged: I'm adding a mailmap entry for you to keep thanks.rust-lang.org working properly.

I have picked the canonical address mostly arbitrarily. If you want a different one as the canonical address, please tell me here.

more details on the change

builds on top of #132471, this containing the less obvious changes that add new canonical email addresses instead of just adding new current ones.

The people updated in this commit have contributed under different email
addresses than the ones they have used in rust-lang/team.
rust-lang/thanks#53 will use team data for thanks reviewers, which requires this to be in
sync.
Therefore, I have updated many of the people that I've noticed being
duplicated after the change.

I'm adding a novel entry for you: @apiraino @KodrAus @cramertj @sunfishcode @Eh2406 @skade @huonw @jsha @shepmaster @workingjubilee @rbtcollins @nrc @fitzgen @sophiajt @tmiasko @notriddle @TimNN @WaffleLapkin

@rustbot
Copy link
Collaborator

rustbot commented Nov 1, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Nov 1, 2024
@Noratrieb Noratrieb force-pushed the lots-of-mailmapping-round-2 branch from 84bc564 to a04081b Compare November 1, 2024 20:16
@Noratrieb
Copy link
Member Author

Added a few additional ones: @b-naber @Centri3 @nikomatsakis @nikic

.mailmap Outdated Show resolved Hide resolved
@Noratrieb Noratrieb force-pushed the lots-of-mailmapping-round-2 branch from 5a65d9d to 18b47b8 Compare November 1, 2024 21:00
.mailmap Outdated Show resolved Hide resolved
.mailmap Show resolved Hide resolved
Copy link
Member

@fmease fmease left a comment

Choose a reason for hiding this comment

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

I've noticed Jieyou Xu also shows up at least twice on thanks/all. Once as Jieyou Xu <********@**********> and once as 许杰友 Jieyou Xu (Joe) <********@**********> (I've redacted the email addresses but they are the same). There's already a mailmap entry for them but it should be extended.

@Noratrieb
Copy link
Member Author

my additional entry fixes this

.mailmap Outdated Show resolved Hide resolved
@Mark-Simulacrum
Copy link
Member

r=me whenever

@Mark-Simulacrum Mark-Simulacrum 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 24, 2024
@bors
Copy link
Contributor

bors commented Dec 2, 2024

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

The people updated in this commit have contributed under different email
addresses than the ones they have used in rust-lang/team.

A new change will use team data for thanks reviewers, which requires this to be in
sync.
Therefore, I have updated many of the people that I've noticed being
duplicated after the change.
@Noratrieb Noratrieb force-pushed the lots-of-mailmapping-round-2 branch from 8c0c5e2 to a985205 Compare December 31, 2024 14:06
@Noratrieb
Copy link
Member Author

It's been a while, everyone had time to correct their entries. If something turns out to be wrong anyways, you can of course always submit a new PR fixing your entries.
@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Dec 31, 2024

📌 Commit a985205 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 31, 2024
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Dec 31, 2024
…d-2, r=Mark-Simulacrum

Add more mailmap entries

If you have been pinged: I'm adding a mailmap entry for you to keep thanks.rust-lang.org working properly.

**I have picked the canonical address mostly arbitrarily. If you want a different one as the canonical address, please tell me here**.

<details>
<summary>more details on the change</summary>

builds on top of rust-lang#132471, this containing the less obvious changes that add new canonical email addresses instead of just adding new current ones.

The people updated in this commit have contributed under different email
addresses than the ones they have used in rust-lang/team.
rust-lang/thanks#53 will use team data for thanks reviewers, which requires this to be in
sync.
Therefore, I have updated many of the people that I've noticed being
duplicated after the change.

</details>

I'm adding a novel entry for you: `@apiraino` `@KodrAus` `@cramertj` `@sunfishcode` `@Eh2406` `@skade` `@huonw` `@jsha` `@shepmaster` `@workingjubilee` `@rbtcollins`  `@nrc` `@fitzgen` `@sophiajt` `@tmiasko` `@notriddle` `@TimNN` `@WaffleLapkin`
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Dec 31, 2024
add .mailmap entry for myself

Seeing rust-lang#132474 in the bors queue I decided to check myself and noticed I was listed four times.
This fixed that by cannonicalizing all entries to use my username and the github no-reply email address, rather than some combination of name or username and different email addresses.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 31, 2024
Rollup of 9 pull requests

Successful merges:

 - rust-lang#132474 (Add more mailmap entries)
 - rust-lang#133486 (borrowck diagnostics: make `add_move_error_suggestions` use the HIR rather than `SourceMap`)
 - rust-lang#134063 (dec2flt: Clean up float parsing modules)
 - rust-lang#134861 (Add GUI test for item info elements color)
 - rust-lang#134968 (Print how to rebless Python formatting in tidy)
 - rust-lang#134971 (chore: fix typos)
 - rust-lang#134972 (add .mailmap entry for myself)
 - rust-lang#134974 (Revert rust-lang#119515 single line where clause style guide)
 - rust-lang#134975 (Revert style guide rhs break)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Dec 31, 2024
add .mailmap entry for myself

Seeing rust-lang#132474 in the bors queue I decided to check myself and noticed I was listed four times.
This fixed that by cannonicalizing all entries to use my username and the github no-reply email address, rather than some combination of name or username and different email addresses.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2025
Rollup of 8 pull requests

Successful merges:

 - rust-lang#132474 (Add more mailmap entries)
 - rust-lang#133486 (borrowck diagnostics: make `add_move_error_suggestions` use the HIR rather than `SourceMap`)
 - rust-lang#134861 (Add GUI test for item info elements color)
 - rust-lang#134968 (Print how to rebless Python formatting in tidy)
 - rust-lang#134971 (chore: fix typos)
 - rust-lang#134972 (add .mailmap entry for myself)
 - rust-lang#134974 (Revert rust-lang#119515 single line where clause style guide)
 - rust-lang#134975 (Revert style guide rhs break)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ecfb85b into rust-lang:master Jan 1, 2025
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 1, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2025
Rollup merge of rust-lang#134972 - Skgland:master, r=Noratrieb

add .mailmap entry for myself

Seeing rust-lang#132474 in the bors queue I decided to check myself and noticed I was listed four times.
This fixed that by cannonicalizing all entries to use my username and the github no-reply email address, rather than some combination of name or username and different email addresses.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2025
Rollup merge of rust-lang#132474 - Noratrieb:lots-of-mailmapping-round-2, r=Mark-Simulacrum

Add more mailmap entries

If you have been pinged: I'm adding a mailmap entry for you to keep thanks.rust-lang.org working properly.

**I have picked the canonical address mostly arbitrarily. If you want a different one as the canonical address, please tell me here**.

<details>
<summary>more details on the change</summary>

builds on top of rust-lang#132471, this containing the less obvious changes that add new canonical email addresses instead of just adding new current ones.

The people updated in this commit have contributed under different email
addresses than the ones they have used in rust-lang/team.
rust-lang/thanks#53 will use team data for thanks reviewers, which requires this to be in
sync.
Therefore, I have updated many of the people that I've noticed being
duplicated after the change.

</details>

I'm adding a novel entry for you: ``@apiraino`` ``@KodrAus`` ``@cramertj`` ``@sunfishcode`` ``@Eh2406`` ``@skade`` ``@huonw`` ``@jsha`` ``@shepmaster`` ``@workingjubilee`` ``@rbtcollins``  ``@nrc`` ``@fitzgen`` ``@sophiajt`` ``@tmiasko`` ``@notriddle`` ``@TimNN`` ``@WaffleLapkin``
@Noratrieb Noratrieb deleted the lots-of-mailmapping-round-2 branch January 1, 2025 10:18
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.

10 participants