Merge pull request #43 from dtolnay/regex

Touch up PR 42

Author: dtolnay

generate/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2018"
 publish = false
 
 [dependencies]
-regex = "1.12.2"
+regex = "1.9"

generate/src/parse.rs

@@ -85,19 +85,12 @@ fn parse_unicode_version(filename: &str, contents: &str) -> (u64, u64, u64) {
     let (name, extension) = filename
         .rsplit_once('.')
         .expect("Failed to split file name into name and extension");
-    let re = Regex::new(&format!(r"# {name}-(\d+).(\d+).(\d+).{extension}")).unwrap();
+    let re = Regex::new(&format!(r"^# {name}-(\d+)\.(\d+)\.(\d+)\.{extension}\n")).unwrap();
     let caps = re
         .captures(contents)
         .expect("Failed to find unicode version in unicode data");
-    let v = caps
-        .iter()
-        .skip(1)
-        .map(|s| {
-            s.unwrap()
-                .as_str()
-                .parse()
-                .expect("Failed to parse unicode version")
-        })
-        .collect::<Vec<u64>>();
-    (v[0], v[1], v[2])
+    let (_, [major, minor, patch]) = caps.extract();
+    [major, minor, patch]
+        .map(|s| s.parse().expect("Failed to parse unicode version"))
+        .into()
 }

generate/src/write.rs

@@ -27,7 +27,7 @@ pub fn output(
     writeln!(
         out,
         "pub const UNICODE_VERSION: (u64, u64, u64) = {:?};",
-        properties.unicode_version()
+        properties.unicode_version(),
     );
     writeln!(out);