Skip to content

.mailmap: fix broken line with multiple emails#153520

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
DanielEScherzer:patch-4
Mar 9, 2026
Merged

.mailmap: fix broken line with multiple emails#153520
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
DanielEScherzer:patch-4

Conversation

@DanielEScherzer
Copy link
Contributor

@DanielEScherzer DanielEScherzer commented Mar 7, 2026

Split binarycat's entry into multiple lines, one for each extra email

Follow-up to #149739, CC @lolbinarycat @Kivooeo

@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 Mar 7, 2026
@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 2026

r? @jieyouxu

rustbot has assigned @jieyouxu.
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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Fallback group: @Mark-Simulacrum, @jieyouxu
  • @Mark-Simulacrum, @jieyouxu expanded to Mark-Simulacrum, jieyouxu
  • Random selection from Mark-Simulacrum, jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented Mar 7, 2026

r? lolbinarycat

@rustbot rustbot assigned lolbinarycat and unassigned jieyouxu Mar 7, 2026
@lolbinarycat
Copy link
Contributor

this file is used by thanks.rust-lang.org to normalize emails, and i have commits using that email in other repositories.

so... yeah that's in there for a reason.

@DanielEScherzer
Copy link
Contributor Author

this file is used by thanks.rust-lang.org to normalize emails, and i have commits using that email in other repositories.

so... yeah that's in there for a reason.

Okay, but it is currently broken - I discovered this while working on the thanks tool, which complains about the line
If the email is needed, I'll just split the line

Split binarycat's entry into multiple lines, one for each extra email
@Kivooeo
Copy link
Member

Kivooeo commented Mar 7, 2026

sorry but why was i pinged here?

@DanielEScherzer
Copy link
Contributor Author

sorry but why was i pinged here?

Because you had approved the previous patch - I figured you you might want to know that the old version with multiple emails was invalid, sorry if that was wrong

@lolbinarycat
Copy link
Contributor

Okay, but it is currently broken - I discovered this while working on the thanks tool, which complains about the line

can you show me the actual error/warning it prints out?

@DanielEScherzer
Copy link
Contributor Author

Okay, but it is currently broken - I discovered this while working on the thanks tool, which complains about the line

can you show me the actual error/warning it prints out?

It says malformed mailmap on line 86: too many emails

See, e.g., the most recent automatic build at https://github.com/rust-lang/thanks/actions/runs/22787734149/job/66108074440, "Build static website" section line 164 of the output

@lolbinarycat
Copy link
Contributor

Alright, seems good now.

@bors r+

@rust-bors
Copy link
Contributor

rust-bors bot commented Mar 8, 2026

📌 Commit c0cb699 has been approved by lolbinarycat

It is now in the queue for this repository.

@rust-bors rust-bors bot 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 Mar 8, 2026
@lolbinarycat
Copy link
Contributor

@bors rollup

rust-bors bot pushed a commit that referenced this pull request Mar 9, 2026
…uwer

Rollup of 6 pull requests

Successful merges:

 - #152535 (std: use `OnceLock` for Xous environment variables)
 - #152646 (Update `UnsafeUnpin` impls involving extern types.)
 - #153559 (Inline and simplify some code for saving incremental data to disk)
 - #151900 (num: Separate public API from internal implementations)
 - #153520 (.mailmap: fix broken line with multiple emails)
 - #153573 (rustdoc-json: fix incorrect documentation for VariantKind::Struct)

Failed merges:

 - #153509 (Cleanup unused diagnostic emission methods - part 2)
@rust-bors rust-bors bot merged commit 9b96973 into rust-lang:main Mar 9, 2026
11 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 9, 2026
rust-timer added a commit that referenced this pull request Mar 9, 2026
Rollup merge of #153520 - DanielEScherzer:patch-4, r=lolbinarycat

.mailmap: fix broken line with multiple emails

Split binarycat's entry into multiple lines, one for each extra email
@DanielEScherzer DanielEScherzer deleted the patch-4 branch March 9, 2026 05:41
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.

5 participants