Skip to content

Conversation

tgross35
Copy link
Contributor

Located this running some scripts to find log duplicates.
r? @y21

@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 Jun 19, 2025
@y21
Copy link
Member

y21 commented Jun 19, 2025

Thanks! Could this just use y21 for the name? IIUC, this file is used by git to map a canonical email address to a contributor having multiple names in the history and the name here is what would be shown by commands like shortlog, right? I think having that for the name would be more useful then

@tgross35
Copy link
Contributor Author

That is correct! Most people put their name rather than their GH profile since it's mostly for the thanks page https://thanks.rust-lang.org/rust/all-time/. But if you still prefer, I'm happy to change it to y21 :)

@y21
Copy link
Member

y21 commented Jun 19, 2025

(oops I forgot to actually send what I typed) Ah yeah, I'd still prefer that ^^

@tgross35
Copy link
Contributor Author

Sure, updated!

@y21
Copy link
Member

y21 commented Jun 19, 2025

Thank you, lgtm! @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 19, 2025

📌 Commit 181ab7d has been approved by y21

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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2025
@y21
Copy link
Member

y21 commented Jun 19, 2025

Ah wait actually -- is this file supposed to be sorted (and so y should go near the end of the file instead)? It looks a lot like it's sorted.

@bors r-
If this is fine feel free to r=me again. Maybe I should have also waited for CI to finish first.

@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 Jun 19, 2025
@tgross35
Copy link
Contributor Author

Oops, you're right; we don't actually enforce it though, and there are a handful of unsorted entries (probably wouldn't be a bad idea). Moved you to the end.

@bors r=y21

@bors
Copy link
Collaborator

bors commented Jun 19, 2025

📌 Commit 240dc05 has been approved by y21

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 Jun 19, 2025
Kobzol added a commit to Kobzol/rust that referenced this pull request Jun 20, 2025
bors added a commit that referenced this pull request Jun 20, 2025
Rollup of 11 pull requests

Successful merges:

 - #142478 (install docs for each target in different directory)
 - #142629 (Add config builder for bootstrap tests)
 - #142715 (correct template for `#[align]` attribute)
 - #142720 (De-dup common code from `ExternalCrate` methods)
 - #142736 (add issue template for rustdoc)
 - #142743 (rustc-dev-guide subtree update)
 - #142744 (Add a mailmap entry for y21)
 - #142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed)
 - #142764 (Convert `ilog(10)` to `ilog10()`)
 - #142767 (Some symbol and PathRoot cleanups)
 - #142769 (remove equivalent new method on context)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jun 20, 2025
Rollup of 10 pull requests

Successful merges:

 - #142629 (Add config builder for bootstrap tests)
 - #142715 (correct template for `#[align]` attribute)
 - #142720 (De-dup common code from `ExternalCrate` methods)
 - #142736 (add issue template for rustdoc)
 - #142743 (rustc-dev-guide subtree update)
 - #142744 (Add a mailmap entry for y21)
 - #142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed)
 - #142764 (Convert `ilog(10)` to `ilog10()`)
 - #142767 (Some symbol and PathRoot cleanups)
 - #142769 (remove equivalent new method on context)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f2c4854 into rust-lang:master Jun 20, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 20, 2025
rust-timer added a commit that referenced this pull request Jun 20, 2025
Rollup merge of #142744 - tgross35:y21-mailmap, r=y21

Add a mailmap entry for y21
@tgross35 tgross35 deleted the y21-mailmap branch June 21, 2025 03:44
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jun 23, 2025
Rollup of 10 pull requests

Successful merges:

 - rust-lang/rust#142629 (Add config builder for bootstrap tests)
 - rust-lang/rust#142715 (correct template for `#[align]` attribute)
 - rust-lang/rust#142720 (De-dup common code from `ExternalCrate` methods)
 - rust-lang/rust#142736 (add issue template for rustdoc)
 - rust-lang/rust#142743 (rustc-dev-guide subtree update)
 - rust-lang/rust#142744 (Add a mailmap entry for y21)
 - rust-lang/rust#142758 (Make sure to rebuild rustdoc if `src/rustdoc-json-types` is changed)
 - rust-lang/rust#142764 (Convert `ilog(10)` to `ilog10()`)
 - rust-lang/rust#142767 (Some symbol and PathRoot cleanups)
 - rust-lang/rust#142769 (remove equivalent new method on context)

r? `@ghost`
`@rustbot` modify labels: rollup
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.

4 participants