Sync reviewers from rust-lang/team

Author: Noratrieb

Cargo.lock

@@ -14,6 +14,8 @@ handlebars = { version = "4.1.1", features = ["dir_source"] }
 walkdir = "2"
 regex = "1.5.5"
 mailmap = { path = "./mailmap" }
+ureq = { version = "2.6.2", features = ["json"] }
+unicase = "2.6.0"
 
 [profile.release]
 debug = 2

Cargo.toml

@@ -12,6 +12,24 @@ To run thanks, you'll need stable Rust.
 There is no need to configure anything; thanks will run everything on its own, simply `cargo run
 --release` and the site will be placed in `output`.
 
+## Identities (or "help, I'm showing up multiple times")
+
+Thanks aggregates data from commits and PR reviews.
+It bases identities on the email addresses from the commits and GitHub usernames from approvals (which it maps to email addresses via rust-lang/team).
+It then uses the `.mailmap` in the rust-lang/rust repository to canonicalize the identities.
+
+If you show up multiple times, it's likely that you have contributed under multiple email addresses and haven't added them to the mailmap.
+To do this, add yourself to the mailmap `.mailmap` like the example here:
+
+```
+Ferris <[email protected]>
+Ferris <[email protected]> <[email protected]>
+Ferris <[email protected]> <[email protected]>
+```
+
+Use the `DEBUG_EMAILS=1` environment variable locally to display the email address in the output,
+which is useful for debugging these missing mailmap entries.
+
 ## Refresh time
 
 Thanks is configured to run every night to update the latest statistics.

README.md

@@ -11,3 +11,4 @@ categories = ["parsing"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
+unicase = "2.6.0"

mailmap/Cargo.toml

@@ -1,7 +1,10 @@
 use std::fmt;
+use std::hash::Hash;
 use std::pin::Pin;
 use std::ptr::NonNull;
 
+use unicase::UniCase;
+
 #[cfg(test)]
 mod test;
 
@@ -74,8 +77,17 @@ impl<'a> MapEntry<'a> {
 
 #[derive(Clone, PartialEq, PartialOrd, Ord, Eq, Hash)]
 pub struct Author {
-    pub name: String,
-    pub email: String,
+    pub name: UniCase<String>,
+    pub email: UniCase<String>,
+}
+
+impl Author {
+    pub fn new(name: String, email: String) -> Self {
+        Self {
+            name: UniCase::new(name),
+            email: UniCase::new(email),
+        }
+    }
 }
 
 impl fmt::Debug for Author {
@@ -105,18 +117,18 @@ impl Mailmap {
             let entry = unsafe { entry.to_entry(&self.buffer) };
             if let Some(email) = entry.current_email {
                 if let Some(name) = entry.current_name {
-                    if author.name == name && author.email == email {
-                        return Author {
-                            name: entry.canonical_name.unwrap_or(&author.name).to_owned(),
-                            email: entry.canonical_email.expect("canonical email").to_owned(),
-                        };
+                    if author.name == UniCase::new(name) && author.email == UniCase::new(email) {
+                        return Author::new(
+                            entry.canonical_name.unwrap_or(&author.name).to_owned(),
+                            entry.canonical_email.expect("canonical email").to_owned(),
+                        );
                     }
                 } else {
-                    if author.email == email {
-                        return Author {
-                            name: entry.canonical_name.unwrap_or(&author.name).to_owned(),
-                            email: entry.canonical_email.expect("canonical email").to_owned(),
-                        };
+                    if author.email == UniCase::new(email) {
+                        return Author::new(
+                            entry.canonical_name.unwrap_or(&author.name).to_owned(),
+                            entry.canonical_email.expect("canonical email").to_owned(),
+                        );
                     }
                 }
             }

mailmap/src/lib.rs

@@ -30,10 +30,7 @@ impl ToAuthor for Author {
             .email()
             .unwrap_or_else(|| panic!("no email for {}", sig));
 
-        Author {
-            name: name.to_string(),
-            email: email.to_string(),
-        }
+        Author::new(name.to_string(), email.to_string())
     }
 }
 
@@ -258,10 +255,10 @@ fn commit_coauthors(commit: &Commit) -> Vec<Author> {
         for line in msg.lines().rev() {
             if line.starts_with("Co-authored-by") {
                 if let Some(caps) = RE.captures(line) {
-                    coauthors.push(Author {
-                        name: caps["name"].to_string(),
-                        email: caps["email"].to_string(),
-                    });
+                    coauthors.push(Author::new(
+                        caps["name"].to_string(),
+                        caps["email"].to_string(),
+                    ));
                 }
             }
         }
@@ -589,14 +586,13 @@ fn main() {
             eprintln!("\tcaused by: {}", cause);
             cur = cause;
         }
-        std::mem::drop(cur);
+        std::mem::drop(err);
         std::process::exit(1);
     }
 }
 
 #[derive(Debug)]
 struct Submodule {
-    path: PathBuf,
     commit: Oid,
     // url
     repository: String,
@@ -631,7 +627,6 @@ fn get_submodules(
         };
         assert_eq!(entry.kind().unwrap(), git2::ObjectType::Commit);
         submodules.push(Submodule {
-            path: path.to_owned(),
             commit: entry.id(),
             repository: url.to_owned(),
         });