Mailmap update
I noticed there are a lot of contributors who appear multiple times in https://thanks.rust-lang.org/rust/all-time/, which makes their "rank" on that page inaccurate. For example Nick Cameron currently appears at rank 21 with 2010 contributions and at rank 27 with 1287 contributions, because some of those are from nrc⁠```@ncameron.org``` and some from ncameron⁠```@mozilla.com.``` In reality Nick's rank would be 11 if counted correctly, which is a large difference.
Solving this in a totally automated way is tricky because it involves figuring out whether Nick is 1 person with multiple emails, or is 2 people sharing the same name.
This PR addresses a subset of the cases: only where a person has committed under multiple names using the same email. This is still not something that can be totally automated (e.g. by modifying https://github.com/rust-lang/thanks to dedup by email instead of name+email) because:
- Some emails are not necessarily unique to one contributor, such as `ubuntu@localhost`.
- It involves some judgement and mindfulness in picking the "canonical name" among the names used with a particular email. This is the name that will appear on thanks.rust-lang.org. Humans change their names sometimes and can be sensitive or picky about the use of names that are no longer preferred.
For the purpose of this PR, I've tried to stick to the following heuristics which should be unobjectionable:
- If one of the names is currently set as the display name on the contributor's GitHub profile, prefer that name.
- If one of the names is used exclusively over the others in chronologically newer pull requests, prefer the newest name.
- If one of the names has whitespace and the other doesn't (i.e. is username-like), such as `Foo Bar` vs `FooBar` or `foobar` or `foo-bar123`, but otherwise closely resemble one another, then prefer the human-like name.
- If none of the above suffice in determining a canonical name and the contributor has some other name set on their GitHub profile, use the name from the GitHub profile.
- If no name on their GitHub profile but the profile links to their personal website which unambiguously identifies their preferred name, then use that name.
I'm also thinking about how to handle cases like Nick's, but that will be a project for a different PR. Basically I'd like to be able to find cases of the same person making commits that differ in name *and* email by looking at all the commits present in pull requests opened by the same GitHub user.
<details>
<summary>script</summary>
```toml
[dependencies]
anyhow = "1.0"
git2 = "0.14"
mailmap = "0.1"
```
```rust
use anyhow::{bail, Context, Result};
use git2::{Commit, Oid, Repository};
use mailmap::{Author, Mailmap};
use std::collections::{BTreeMap as Map, BTreeSet as Set};
use std::fmt::{self, Debug};
use std::fs;
use std::path::Path;
const REPO: &str = "/git/rust";
fn main() -> Result<()> {
let repo = Repository::open(REPO)?;
let head_oid = repo
.head()?
.target()
.context("expected head to be a direct reference")?;
let head = repo.find_commit(head_oid)?;
let mailmap_path = Path::new(REPO).join(".mailmap");
let mailmap_contents = fs::read_to_string(mailmap_path)?;
let mailmap = match Mailmap::from_string(mailmap_contents) {
Ok(mailmap) => mailmap,
Err(box_error) => bail!("{}", box_error),
};
let mut history = Set::new();
let mut merges = Vec::new();
let mut authors = Set::new();
let mut emails = Map::new();
let mut all_authors = Set::new();
traverse_left(head, &mut history, &mut merges, &mut authors, &mailmap)?;
while let Some((commit, i)) = merges.pop() {
let right = commit.parents().nth(i).unwrap();
authors.clear();
traverse_left(right, &mut history, &mut merges, &mut authors, &mailmap)?;
for author in &authors {
all_authors.insert(author.clone());
if !author.email.is_empty() {
emails
.entry(author.email.clone())
.or_insert_with(Map::new)
.entry(author.name.clone())
.or_insert_with(Set::new);
}
}
if let Some(summary) = commit.summary() {
if let Some(pr) = parse_summary(summary)? {
for author in &authors {
if !author.email.is_empty() {
emails
.get_mut(&author.email)
.unwrap()
.get_mut(&author.name)
.unwrap()
.insert(pr);
}
}
}
}
}
for (email, names) in emails {
if names.len() > 1 {
println!("<{}>", email);
for (name, prs) in names {
let prs = DebugSet(prs.iter().rev());
println!(" {} {:?}", name, prs);
}
}
}
eprintln!("{} commits", history.len());
eprintln!("{} authors", all_authors.len());
Ok(())
}
fn traverse_left<'repo>(
mut commit: Commit<'repo>,
history: &mut Set<Oid>,
merges: &mut Vec<(Commit<'repo>, usize)>,
authors: &mut Set<Author>,
mailmap: &Mailmap,
) -> Result<()> {
loop {
let oid = commit.id();
if !history.insert(oid) {
return Ok(());
}
let author = author(mailmap, &commit);
let is_bors = author.name == "bors" && author.email == "bors@rust-lang.org";
if !is_bors {
authors.insert(author);
}
let mut parents = commit.parents();
let parent = match parents.next() {
Some(parent) => parent,
None => return Ok(()),
};
for i in 1..1 + parents.len() {
merges.push((commit.clone(), i));
}
commit = parent;
}
}
fn parse_summary(summary: &str) -> Result<Option<PullRequest>> {
let mut rest = None;
for prefix in [
"Auto merge of #",
"Merge pull request #",
" Manual merge of #",
"auto merge of #",
"auto merge of pull req #",
"rollup merge of #",
"Rollup merge of #",
"Rollup merge of #",
"Rollup merge of ",
"Merge PR #",
"Merge #",
"Merged #",
] {
if summary.starts_with(prefix) {
rest = Some(&summary[prefix.len()..]);
break;
}
}
let rest = match rest {
Some(rest) => rest,
None => return Ok(None),
};
let end = rest.find([' ', ':']).unwrap_or(rest.len());
let number = match rest[..end].parse::<u32>() {
Ok(number) => number,
Err(err) => {
eprintln!("{}", summary);
bail!(err);
}
};
Ok(Some(PullRequest(number)))
}
fn author(mailmap: &Mailmap, commit: &Commit) -> Author {
let signature = commit.author();
let name = String::from_utf8_lossy(signature.name_bytes()).into_owned();
let email = String::from_utf8_lossy(signature.email_bytes()).into_owned();
mailmap.canonicalize(&Author { name, email })
}
#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
struct PullRequest(u32);
impl Debug for PullRequest {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(formatter, "#{}", self.0)
}
}
struct DebugSet<T>(T);
impl<T> Debug for DebugSet<T>
where
T: Iterator + Clone,
T::Item: Debug,
{
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.debug_set().entries(self.0.clone()).finish()
}
}
```
</details>
Add known-bug for #95034
Couldn't fix the issue, since I am no type theorist and inference variables in universes above U0 scare me. But I at least wanted to add a known-bug test for it.
cc #95034 (does not fix)
check_doc_alias_value: get argument as Symbol to prevent needless string convertions
check_doc_attrs: don't alloc vec, iterate over slice. Vec introduced in #83149, but no perf run posted on merge
replace as_str() check with symbol check
get_single_str_from_tts: don't prealloc string
trivial string to str replace
LifetimeScopeForPath::NonElided use Vec<Symbol> instead of Vec<String>
AssertModuleSource use BTreeSet<Symbol> instead of BTreeSet<String>
CrateInfo.crate_name replace FxHashMap<CrateNum, String> with FxHashMap<CrateNum, Symbol>
make windows compat_fn (crudely) work on Miri
With https://github.com/rust-lang/rust/pull/95469, Windows `compat_fn!` now has to be supported by Miri to even make stdout work. Unfortunately, it relies on some outside-of-Rust linker hacks (`#[link_section = ".CRT$XCU"]`) that are rather hard to make work in Miri. So I came up with this crude hack to make this stuff work in Miri regardless. It should come at no cost for regular executions, so I hope this is okay.
Cc https://github.com/rust-lang/rust/issues/95627 `@ChrisDenton`
Fix `x test src/tools/error_index_generator --stage {0,1}`
There were two fixes needed:
1. Use `top_stage` instead of `top_stage - 1`. There was a long and torturous comment about trying to match rustdoc's version, but it works better without the hard-coding than with (before it gave errors that `libtest.so` couldn't be found).
2. Make sure that `ci-llvm/lib` is added to LD_LIBRARY_PATH. Previously the error index would be unable to load LLVM for stage0 builds.
At some point we should probably have a discussion about how rustdoc stages should be numbered;
confusion between 0/1/2 has come up several times in bootstrap now. cc https://github.com/rust-lang/rust/issues/92538
Note that this is still broken when using `download-rustc = true` and `--stage 1`,
but that's *really* a corner case and should affect almost no one. `--stage {0,2}`
work fine with download-rustc.
Fixes https://github.com/rust-lang/rust/issues/80096.
This commit suggests replacing typeof(...) with an actual type of "...",
for example in case of `typeof(1)` we suggest replacing it with `i32`.
If the expression
- Is not const (`{ let a = 1; let _: typeof(a); }`)
- Can't be found (`let _: typeof(this_variable_does_not_exist)`)
- Or has non-suggestable type (closure, generator, error, etc)
we don't suggest anything.
Report opaque type mismatches directly during borrowck of the function instead of within the `type_of` query.
This allows us to only store a single hidden type per opaque type instead of having to store one per set of substitutions.
r? `@compiler-errors`
This does not affect diagnostics, because the diagnostic messages are exactly the same.
Allow raw lint descriptions
update_lints now understands raw strings in declare_clippy_lint descriptions.
Supersedes #8655
cc `@Alexendoo` thanks for addressing this so quickly. I build a little bit simpler version of your patch. I don't think it really matters what `Literal` we're trying to tokenize, since we assume later, that it is some sort of `str`.
changelog: none
Add a lint to detect cast to unsigned for abs() and suggest unsigned_…
…abs()
changelog: Add a [`cast_abs_to_unsigned`] that checks for uses of `abs()` that are cast to the corresponding unsigned integer type and suggest to replace them with `unsigned_abs()`.
Fix `as_deref_mut` false positives in `needless_option_as_deref`
Also moves it into `methods/`
Fixes#7846Fixes#8047
changelog: [`needless_option_as_deref`]: No longer lints for `as_deref_mut` on Options that cannot be moved
supersedes #8064
Use gender neutral terms
#95508 was not executed well, but it did find a couple of legitimate issues: some uses of unnecessarily gendered language, and some typos. This PR fixes (properly) the legitimate issues it found.
Correct safety reasoning in `str::make_ascii_{lower,upper}case()`
I don't understand why the previous comment was used (it was inserted in #66564), but it doesn't explain why these functions are safe, only why `str::as_bytes{_mut}()` are safe.
If someone thinks they make perfect sense, I'm fine with closing this PR.
Regression test for #82866
Saw that this issue was open when i was cleaning my old branch for #92237.
I am also not opposed to not adding an extra test and just closing #82866.
Fixes#82866
