Check clippy and formatting in CI

Jules-Bertholet · Jules-Bertholet · commit b077494e98ff · 2024-02-29T11:47:31.000-05:00
And also mass-reformat.
`tables.rs` is ignored for now
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -7,7 +7,10 @@ on:
     branches: [ master ]
 
 env:
+  CARGO_INCREMENTAL: 0
   CARGO_TERM_COLOR: always
+  RUST_BACKTRACE: 1
+  RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings --cfg docsrs
 
 jobs:
@@ -21,17 +24,17 @@ jobs:
           - nightly
     steps:
     - uses: actions/checkout@v2
-    - name: Install latest nightly
+    - name: Install toolchain
       uses: actions-rs/toolchain@v1
       with:
           toolchain: ${{ matrix.rust }}
           override: true
     - name: Build
       run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+    - name: Run tests with all features
+      run: cargo test --all-features --verbose
     - name: Run tests without features
-      run: cargo test --verbose --no-default-features
+      run: cargo test --no-default-features --verbose
     - name: Package
       run: cargo package
     - name: Test package
@@ -41,6 +44,12 @@ jobs:
     - name: Build docs
       if: matrix.rust == 'nightly'
       run: cargo doc --all-features --verbose
+    - name: Check formatting
+      if: matrix.rust == 'stable'
+      run: cargo fmt --all --check
+    - name: Check clippy
+      if: matrix.rust == 'stable'
+      run: cargo clippy --all-features --all --verbose
   msrv:
     runs-on: ubuntu-latest
     steps:
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,14 +2,23 @@
 
 name = "unicode-normalization"
 version = "0.1.23"
-authors = ["kwantam <kwantam@gmail.com>", "Manish Goregaokar <manishsmail@gmail.com>"]
+authors = [
+    "kwantam <kwantam@gmail.com>",
+    "Manish Goregaokar <manishsmail@gmail.com>",
+]
 
 homepage = "https://github.com/unicode-rs/unicode-normalization"
 repository = "https://github.com/unicode-rs/unicode-normalization"
 documentation = "https://docs.rs/unicode-normalization/"
 
 license = "MIT/Apache-2.0"
-keywords = ["text", "unicode", "normalization", "decomposition", "recomposition"]
+keywords = [
+    "text",
+    "unicode",
+    "normalization",
+    "decomposition",
+    "recomposition",
+]
 readme = "README.md"
 description = """
 This crate provides functions for normalization of
@@ -22,7 +31,7 @@ rust-version = "1.36"
 
 edition = "2018"
 
-exclude = [ "target/*", "Cargo.lock", "scripts/tmp", "*.txt", "tests/*" ]
+exclude = ["target/*", "Cargo.lock", "scripts/tmp", "*.txt", "tests/*"]
 
 [dependencies.tinyvec]
 version = "1"
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -579,6 +579,7 @@ def minimal_perfect_hash(d):
     data = UnicodeData()
     with open("tables.rs", "w", newline = "\n") as out:
         out.write(PREAMBLE)
+        out.write("#![cfg_attr(rustfmt, rustfmt::skip)]\n")
         out.write("use crate::quick_check::IsNormalized;\n")
         out.write("use crate::quick_check::IsNormalized::*;\n")
         out.write("\n")
diff --git a/src/__test_api.rs b/src/__test_api.rs
@@ -5,7 +5,7 @@
 // If you're caught using this outside this crates tests/, you get to clean up the mess.
 
 #[cfg(not(feature = "std"))]
-use crate::no_std_prelude::*;
+use alloc::string::String;
 
 use crate::stream_safe::StreamSafe;
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -62,12 +62,7 @@ pub use crate::recompose::Recompositions;
 pub use crate::replace::Replacements;
 pub use crate::stream_safe::StreamSafe;
 pub use crate::tables::UNICODE_VERSION;
-use core::{
-    str::Chars,
-    option,
-};
-
-mod no_std_prelude;
+use core::{option, str::Chars};
 
 mod decompose;
 mod lookups;
@@ -169,7 +164,6 @@ impl<'a> UnicodeNormalization<Chars<'a>> for &'a str {
     }
 }
 
-
 impl UnicodeNormalization<option::IntoIter<char>> for char {
     #[inline]
     fn nfd(self) -> Decompositions<option::IntoIter<char>> {
diff --git a/src/no_std_prelude.rs b/src/no_std_prelude.rs
diff --git a/src/stream_safe.rs b/src/stream_safe.rs
@@ -110,7 +110,7 @@ mod tests {
     use crate::normalize::decompose_compatible;
 
     #[cfg(not(feature = "std"))]
-    use crate::no_std_prelude::*;
+    use alloc::{string::String, vec::Vec};
 
     use core::char;
 
diff --git a/src/tables.rs b/src/tables.rs
@@ -11,6 +11,7 @@
 // NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
 
 #![allow(missing_docs)]
+#![cfg_attr(rustfmt, rustfmt::skip)]
 use crate::quick_check::IsNormalized;
 use crate::quick_check::IsNormalized::*;
 
diff --git a/src/test.rs b/src/test.rs
@@ -13,7 +13,7 @@ use super::UnicodeNormalization;
 use core::char;
 
 #[cfg(not(feature = "std"))]
-use crate::no_std_prelude::*;
+use alloc::string::{String, ToString};
 
 #[test]
 fn test_nfd() {
diff --git a/tests/test_streamsafe_regression.rs b/tests/test_streamsafe_regression.rs
@@ -1,14 +1,12 @@
-use unicode_normalization::{
-    is_nfc, is_nfc_stream_safe, UnicodeNormalization,
-};
-
-#[test]
-fn test_streamsafe_regression(){
-    let input = "\u{342}".repeat(55) + &"\u{344}".repeat(3);
-    let nfc_ss = input.chars().nfc().stream_safe().collect::<String>();
-
-    // The result should be NFC:
-    assert!(is_nfc(&nfc_ss));
-    // and should be stream-safe:
-    assert!(is_nfc_stream_safe(&nfc_ss))
-}
+use unicode_normalization::{is_nfc, is_nfc_stream_safe, UnicodeNormalization};
+
+#[test]
+fn test_streamsafe_regression() {
+    let input = "\u{342}".repeat(55) + &"\u{344}".repeat(3);
+    let nfc_ss = input.chars().nfc().stream_safe().collect::<String>();
+
+    // The result should be NFC:
+    assert!(is_nfc(&nfc_ss));
+    // and should be stream-safe:
+    assert!(is_nfc_stream_safe(&nfc_ss))
+}
