Make names & emails ASCII-case-insensitive

GrigorenkoPV · GrigorenkoPV · commit 0574a0ff59dc · 2024-08-14T17:42:11.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mailmap/Cargo.toml b/mailmap/Cargo.toml
@@ -11,3 +11,4 @@ categories = ["parsing"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
+uncased = "0.9.10"
diff --git a/mailmap/src/lib.rs b/mailmap/src/lib.rs
@@ -2,6 +2,8 @@ use std::fmt;
 use std::pin::Pin;
 use std::ptr::NonNull;
 
+use uncased::{Uncased, UncasedStr};
+
 #[cfg(test)]
 mod test;
 
@@ -36,10 +38,10 @@ impl fmt::Debug for Mailmap {
 
 #[derive(Copy, Clone)]
 struct RawMapEntry {
-    canonical_name: Option<NonNull<str>>,
-    canonical_email: Option<NonNull<str>>,
-    current_name: Option<NonNull<str>>,
-    current_email: Option<NonNull<str>>,
+    canonical_name: Option<NonNull<UncasedStr>>,
+    canonical_email: Option<NonNull<UncasedStr>>,
+    current_name: Option<NonNull<UncasedStr>>,
+    current_email: Option<NonNull<UncasedStr>>,
 }
 
 impl RawMapEntry {
@@ -55,10 +57,10 @@ impl RawMapEntry {
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 struct MapEntry<'a> {
-    canonical_name: Option<&'a str>,
-    canonical_email: Option<&'a str>,
-    current_name: Option<&'a str>,
-    current_email: Option<&'a str>,
+    canonical_name: Option<&'a UncasedStr>,
+    canonical_email: Option<&'a UncasedStr>,
+    current_name: Option<&'a UncasedStr>,
+    current_email: Option<&'a UncasedStr>,
 }
 
 impl<'a> MapEntry<'a> {
@@ -74,8 +76,8 @@ impl<'a> MapEntry<'a> {
 
 #[derive(Clone, PartialEq, PartialOrd, Ord, Eq, Hash)]
 pub struct Author {
-    pub name: String,
-    pub email: String,
+    pub name: Uncased<'static>,
+    pub email: Uncased<'static>,
 }
 
 impl fmt::Debug for Author {
@@ -107,15 +109,31 @@ impl Mailmap {
                 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(),
+                            name: entry
+                                .canonical_name
+                                .unwrap_or(&author.name)
+                                .to_string()
+                                .into(),
+                            email: entry
+                                .canonical_email
+                                .expect("canonical email")
+                                .to_string()
+                                .into(),
                         };
                     }
                 } 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(),
+                            name: entry
+                                .canonical_name
+                                .unwrap_or(&author.name)
+                                .to_string()
+                                .into(),
+                            email: entry
+                                .canonical_email
+                                .expect("canonical email")
+                                .to_string()
+                                .into(),
                         };
                     }
                 }
@@ -126,7 +144,7 @@ impl Mailmap {
     }
 }
 
-fn read_email<'a>(line: &mut &'a str) -> Option<&'a str> {
+fn read_email<'a>(line: &mut &'a str) -> Option<&'a UncasedStr> {
     if !line.starts_with('<') {
         return None;
     }
@@ -136,21 +154,21 @@ fn read_email<'a>(line: &mut &'a str) -> Option<&'a str> {
         .unwrap_or_else(|| panic!("could not find email end in {:?}", line));
     let ret = &line[1..end];
     *line = &line[end + 1..];
-    Some(ret)
+    Some(ret.into())
 }
 
-fn read_name<'a>(line: &mut &'a str) -> Option<&'a str> {
+fn read_name<'a>(line: &mut &'a str) -> Option<&'a UncasedStr> {
     let end = if let Some(end) = line.find('<') {
         end
     } else {
         return None;
     };
-    let ret = &line[..end].trim();
+    let ret = line[..end].trim();
     *line = &line[end..];
     if ret.is_empty() {
         None
     } else {
-        Some(ret)
+        Some(ret.into())
     }
 }
 
diff --git a/mailmap/src/test.rs b/mailmap/src/test.rs
@@ -23,7 +23,7 @@ fn comment_2() {
 fn email_1() {
     assert_eq!(
         test_parser!(read_email, "<foo@example.com>", ""),
-        Some("foo@example.com")
+        Some("foo@example.com".into())
     );
 }
 
@@ -35,7 +35,7 @@ fn email_2() {
             "<foo@example.com> <foo2@example.com>",
             " <foo2@example.com>"
         ),
-        Some("foo@example.com")
+        Some("foo@example.com".into())
     );
 }
 
@@ -59,7 +59,7 @@ fn name_1() {
             "Canonical Name <foo@example.com>",
             "<foo@example.com>"
         ),
-        Some("Canonical Name"),
+        Some("Canonical Name".into()),
     );
 }
 
@@ -68,10 +68,10 @@ fn line_1() {
     assert_eq!(
         parse_line("Joe Bob <email1> <email2>", 0),
         Some(MapEntry {
-            canonical_name: Some("Joe Bob"),
-            canonical_email: Some("email1"),
+            canonical_name: Some("Joe Bob".into()),
+            canonical_email: Some("email1".into()),
             current_name: None,
-            current_email: Some("email2"),
+            current_email: Some("email2".into()),
         })
     );
 }
@@ -81,18 +81,18 @@ fn line_2() {
     assert_eq!(
         parse_line("Joe Bob <email1>", 0),
         Some(MapEntry {
-            canonical_name: Some("Joe Bob"),
-            canonical_email: Some("email1"),
+            canonical_name: Some("Joe Bob".into()),
+            canonical_email: Some("email1".into()),
             current_name: None,
-            current_email: Some("email1"),
+            current_email: Some("email1".into()),
         })
     );
 }
 
 fn a(name: &str, email: &str) -> Author {
     Author {
-        name: name.into(),
-        email: email.into(),
+        name: name.to_owned().into(),
+        email: email.to_owned().into(),
     }
 }
 
@@ -123,3 +123,12 @@ fn map_4() {
     let mm = map("<PE> <CE>");
     assert_eq!(mm.canonicalize(&a("any", "CE")), a("any", "PE"));
 }
+
+#[test]
+fn case_insensitive() {
+    let mm = map("Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>");
+    assert_eq!(
+        mm.canonicalize(&a("Commit Name", "commit@email.xx")),
+        a("Proper Name", "proper@email.xx")
+    );
+}
diff --git a/src/main.rs b/src/main.rs
@@ -31,8 +31,8 @@ impl ToAuthor for Author {
             .unwrap_or_else(|| panic!("no email for {}", sig));
 
         Author {
-            name: name.to_string(),
-            email: email.to_string(),
+            name: name.to_string().into(),
+            email: email.to_string().into(),
         }
     }
 }
@@ -259,8 +259,8 @@ fn commit_coauthors(commit: &Commit) -> Vec<Author> {
             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(),
+                        name: caps["name"].to_string().into(),
+                        email: caps["email"].to_string().into(),
                     });
                 }
             }
@@ -589,7 +589,7 @@ fn main() {
             eprintln!("\tcaused by: {}", cause);
             cur = cause;
         }
-        std::mem::drop(cur);
+        let _ = cur;
         std::process::exit(1);
     }
 }
diff --git a/src/reviewers.rs b/src/reviewers.rs
@@ -15,8 +15,8 @@ impl Reviewers {
 
         fn a(name: &str, email: &str) -> Author {
             Author {
-                name: name.into(),
-                email: email.into(),
+                name: name.to_string().into(),
+                email: email.to_string().into(),
             }
         }
 
diff --git a/src/site.rs b/src/site.rs
@@ -146,7 +146,7 @@ fn author_map_to_scores(map: &AuthorMap) -> Vec<Entry> {
         .iter()
         .map(|(author, commits)| Entry {
             rank: 0,
-            author: author.name.clone(),
+            author: author.name.to_string(),
             commits: commits,
         })
         .collect::<Vec<_>>();

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ categories = ["parsing"]`
`11`	`11`	`license = "MIT OR Apache-2.0"`
`12`	`12`
`13`	`13`	`[dependencies]`
	`14`	`+uncased = "0.9.10"`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ impl ToAuthor for Author {`
`31`	`31`	`.unwrap_or_else(\|\| panic!("no email for {}", sig));`
`32`	`32`
`33`	`33`	`Author {`
`34`		`- name: name.to_string(),`
`35`		`- email: email.to_string(),`
	`34`	`+ name: name.to_string().into(),`
	`35`	`+ email: email.to_string().into(),`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
`@@ -259,8 +259,8 @@ fn commit_coauthors(commit: &Commit) -> Vec<Author> {`
`259`	`259`	`if line.starts_with("Co-authored-by") {`
`260`	`260`	`if let Some(caps) = RE.captures(line) {`
`261`	`261`	`coauthors.push(Author {`
`262`		`- name: caps["name"].to_string(),`
`263`		`- email: caps["email"].to_string(),`
	`262`	`+ name: caps["name"].to_string().into(),`
	`263`	`+ email: caps["email"].to_string().into(),`
`264`	`264`	`});`
`265`	`265`	`}`
`266`	`266`	`}`
`@@ -589,7 +589,7 @@ fn main() {`
`589`	`589`	`eprintln!("\tcaused by: {}", cause);`
`590`	`590`	`cur = cause;`
`591`	`591`	`}`
`592`		`- std::mem::drop(cur);`
	`592`	`+ let _ = cur;`
`593`	`593`	`std::process::exit(1);`
`594`	`594`	`}`
`595`	`595`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ impl Reviewers {`
`15`	`15`
`16`	`16`	`fn a(name: &str, email: &str) -> Author {`
`17`	`17`	`Author {`
`18`		`- name: name.into(),`
`19`		`- email: email.into(),`
	`18`	`+ name: name.to_string().into(),`
	`19`	`+ email: email.to_string().into(),`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`