Add missing test folders to fmt script (#1459)

Author: celinval

rustfmt.toml

@@ -8,16 +8,12 @@ use_small_heuristics = "Max"
 merge_derives = false
 
 ignore = [
-    "/build/",
-    "/*-build/",
-    "/build-*/",
-    "/vendor/",
-    "/target/",
+    "**/build/",
+    "**/target/",
 
-    # do not format submodules
-    "firecracker",
-    "tests/perf/s2n-quic",
-    "tools/bookrunner/rust-doc/nomicon",
-    "tools/bookrunner/rust-doc/reference",
-    "tools/bookrunner/rust-doc/rust-by-example"
+    # Do not format submodules
+    # For some reason, this is not working without the directory wildcard.
+    "**/firecracker",
+    "**/tests/perf/s2n-quic/",
+    "**/tools/bookrunner/rust-doc/",
 ]

scripts/kani-fmt.sh

@@ -19,20 +19,19 @@ error=0
 cargo fmt "$@" || error=1
 
 # Check test source files.
-TESTS=("tests/kani"
-    "tests/prusti"
-    "tests/smack"
-    "tests/expected"
-    "tests/cargo-kani"
-    "docs/src/tutorial")
+# Note that this will respect the ignore section of rustfmt.toml. If you need to
+# skip any file / directory, add it there.
+TESTS=("tests" "docs/src/tutorial")
 
 for suite in "${TESTS[@]}"; do
     # Find uses breakline to split between files. This ensures that we can
     # handle files with space in their path.
     set -f; IFS=$'\n'
     files=($(find "${suite}" -name "*.rs"))
     set +f; unset IFS
-    rustfmt --unstable-features "$@" "${files[@]}" || error=1
+    # Note: We set the configuration file here because some submodules have
+    # their own configuration file.
+    rustfmt --unstable-features "$@" --config-path rustfmt.toml "${files[@]}" || error=1
 done
 
 exit $error

tests/cargo-ui/dry-run/src/lib.rs

@@ -7,5 +7,5 @@
 
 #[kani::proof]
 pub fn broken_harness() {
-    let invalid: Nope = Nope{};
+    let invalid: Nope = Nope {};
 }

tests/firecracker/micro-http-parsed-request/ignore-main.rs

@@ -5,7 +5,7 @@
 
 // Should return a nondet string of up to n characters
 // Currently Kani does not support strings
-fn kani::any_string(n: u32) -> String {
+fn any_string(n: u32) -> String {
     unimplemented!()
 }
 

tests/kani-dependency-test/dependency3/src/lib.rs

@@ -5,7 +5,7 @@ pub struct Foo {
     x: i32,
 }
 
-// Export a function that takes a struct type which differs between this crate 
+// Export a function that takes a struct type which differs between this crate
 // and the other vesion
 pub fn take_foo(foo: &Foo) -> i32 {
     foo.x
@@ -18,8 +18,8 @@ pub fn give_foo() -> Foo {
 pub fn get_int() -> i32 {
     // Use a constant to force an MIR GlobalAllocation::Memory.
     // Use a non-i32 so there will be a conflict between this
-    // version and the other version. The constant is also a 
+    // version and the other version. The constant is also a
     // different value than the other version of this dependency.
     let one = &(1 as i8);
-    return *one as i32
+    return *one as i32;
 }

tests/kani-dependency-test/diamond-dependency/dependency3/src/lib.rs

@@ -7,7 +7,7 @@ pub struct Foo {
     y: i32,
 }
 
-// Export a function that takes a struct type which differs between this crate 
+// Export a function that takes a struct type which differs between this crate
 // and the other vesion.
 pub fn take_foo(foo: &Foo) -> i32 {
     foo.x + foo.y
@@ -20,5 +20,5 @@ pub fn give_foo() -> Foo {
 pub fn get_int() -> i32 {
     // Use a constant to force an MIR GlobalAllocation::Memory
     let zero = &0;
-    return *zero
+    return *zero;
 }

tests/perf/kani-lib/arbitrary/src/check_arbitrary.rs

@@ -22,7 +22,7 @@ fn check_any_char() {
 #[kani::proof]
 #[kani::unwind(101)]
 fn check_any_char_array() {
-    let arr : [char; 100] = kani::any();
+    let arr: [char; 100] = kani::any();
     for i in 0..100 {
         let c = arr[i];
         let n = c as u32;
@@ -33,7 +33,7 @@ fn check_any_char_array() {
 #[kani::proof]
 #[kani::unwind(101)]
 fn check_any_usize_array() {
-    let arr : [usize; 100] = kani::any();
+    let arr: [usize; 100] = kani::any();
     for i in 0..100 {
         let us = arr[i];
         kani::assume(us < 100);
@@ -46,7 +46,7 @@ fn check_any_usize_option() {
     let mut all_none = true;
     let mut all_some = true;
     for _ in 0..100 {
-        let us : Option::<usize> = kani::any();
+        let us: Option<usize> = kani::any();
         all_none &= us.is_none();
         all_some &= us.is_some();
     }
@@ -59,7 +59,7 @@ fn check_any_usize_result() {
     let mut all_ok = true;
     let mut all_err = true;
     for _ in 0..100 {
-        let us : Result::<usize, isize> = kani::any();
+        let us: Result<usize, isize> = kani::any();
         all_ok &= us.is_ok();
         all_err &= us.is_err();
     }
@@ -72,7 +72,7 @@ fn check_any_bool() {
     let mut all_true = true;
     let mut all_false = true;
     for _ in 0..100 {
-        let val : bool = kani::any();
+        let val: bool = kani::any();
         all_true &= val;
         all_false &= !val;
     }

tests/stub-tests/Vec/append.rs

@@ -6,7 +6,7 @@ fn main() {
         let mut vec = kani_vec![1, 2, 3];
         let mut vec2 = kani_vec![4, 5, 6];
         vec.append(&mut vec2);
-        assert!(vec  == [1, 2, 3, 4, 5, 6]);
+        assert!(vec == [1, 2, 3, 4, 5, 6]);
         assert!(vec2 == []);
     }
 

tests/stub-tests/Vec/drop.rs

@@ -5,7 +5,7 @@
 static mut GLOB: i32 = 1;
 
 struct Test {
-    _marker: u32
+    _marker: u32,
 }
 
 impl Drop for Test {

tests/stub-tests/Vec/into_iter.rs

@@ -10,7 +10,6 @@ fn main() {
         assert!(iter.next() == Some(4));
         assert!(iter.next() == Some(5));
         assert!(iter.next() == None);
-
     }
 
     into_iter_test();