Fix CI, address review comments

Jules-Bertholet · Jules-Bertholet · commit b8519e950876 · 2024-05-10T23:08:46.000-04:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Rustfmt
       run: cargo fmt --all --check
     - name: Verify regenerated files
-      run: ./scripts/unicode.py && diff tables.rs src/tables.rs
+      run: ./scripts/unicode.py && rustfmt tables.rs && diff tables.rs src/tables.rs
     - name: Verify regenerated tests
       run: ./scripts/unicode_gen_breaktests.py && rustfmt testdata.rs && diff testdata.rs tests/testdata/mod.rs
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -453,22 +453,3 @@ def emit_break_module(f, break_table, break_cats, name):
             sentence_table.extend([(x, y, cat) for (x, y) in sentence_cats[cat]])
         sentence_table.sort(key=lambda w: w[0])
         emit_break_module(rf, sentence_table, list(sentence_cats.keys()), "sentence")
-
-        rf.write("""
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_syriac_abbr_mark() {
-        use crate::tables::word as wd;
-        let (_, _, cat) = wd::word_category('\\u{70f}');
-        assert_eq!(cat, wd::WC_ALetter);
-    }
-
-    #[test]
-    fn test_end_of_ayah_cat() {
-        use crate::tables::word as wd;
-        let (_, _, cat) = wd::word_category('\\u{6dd}');
-        assert_eq!(cat, wd::WC_Numeric);
-    }
-}
-""")
diff --git a/src/lib.rs b/src/lib.rs
@@ -63,9 +63,8 @@ pub use tables::UNICODE_VERSION;
 pub use word::{UWordBoundIndices, UWordBounds, UnicodeWordIndices, UnicodeWords};
 
 mod grapheme;
-#[rustfmt::skip]
-mod tables;
 mod sentence;
+mod tables;
 mod word;
 
 /// Methods for segmenting strings according to
diff --git a/src/tables.rs b/src/tables.rs
diff --git a/src/word.rs b/src/word.rs
@@ -760,3 +760,20 @@ pub fn new_unicode_word_indices(s: &str) -> UnicodeWordIndices<'_> {
             .filter(|(_, c)| has_alphanumeric(c)),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_syriac_abbr_mark() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\u{70f}');
+        assert_eq!(cat, wd::WC_ALetter);
+    }
+
+    #[test]
+    fn test_end_of_ayah_cat() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\u{6dd}');
+        assert_eq!(cat, wd::WC_Numeric);
+    }
+}
diff --git a/tests/test.rs b/tests/test.rs
@@ -11,7 +11,6 @@
 use quickcheck::quickcheck;
 use unicode_segmentation::UnicodeSegmentation;
 
-#[rustfmt::skip]
 mod testdata;
 
 #[test]
diff --git a/tests/testdata/mod.rs b/tests/testdata/mod.rs
