Merge pull request #4533 from tgross35/enforce-fmt

Add `--check` to `cargo fmt` run in CI

Author: tgross35

ci/style.sh

@@ -9,9 +9,6 @@ cargo test --manifest-path libc-test/Cargo.toml --test style -- --nocapture
 command -v rustfmt
 rustfmt -V
 
-# Run once to cover everything that isn't in `src/`
-cargo fmt
-
 # Save a list of all source files
 tmpfile="file-list~" # trailing tilde for gitignore
 find src -name '*.rs' > "$tmpfile"
@@ -61,7 +58,7 @@ rm "$tmpfile"
 
 # Run once from workspace root to get everything that wasn't handled as an
 # individual file.
-cargo fmt
+cargo fmt "$check"
 
 # Ensure that `sort` output is not locale-dependent
 export LC_ALL=C

ctest-next/src/ffi_items.rs

@@ -1,6 +1,7 @@
 use std::ops::Deref;
 
-use syn::{punctuated::Punctuated, visit::Visit};
+use syn::punctuated::Punctuated;
+use syn::visit::Visit;
 
 use crate::{Abi, Const, Field, Fn, Parameter, Static, Struct, Type, Union};
 

ctest-next/src/generator.rs

@@ -1,19 +1,16 @@
-use std::{
-    env,
-    fs::File,
-    io::Write,
-    path::{Path, PathBuf},
-};
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::{Path, PathBuf};
 
 use askama::Template;
 use syn::visit::Visit;
 use thiserror::Error;
 
+use crate::ffi_items::FfiItems;
+use crate::template::{CTestTemplate, RustTestTemplate};
 use crate::{
-    expand,
-    ffi_items::FfiItems,
-    template::{CTestTemplate, RustTestTemplate},
-    Const, Field, MapInput, Parameter, Result, Static, Struct, Type, VolatileItemKind,
+    expand, Const, Field, MapInput, Parameter, Result, Static, Struct, Type, VolatileItemKind,
 };
 
 /// A function that takes a mappable input and returns its mapping as Some, otherwise

ctest-next/src/macro_expansion.rs

@@ -1,4 +1,7 @@
-use std::{env, fs::canonicalize, path::Path, process::Command};
+use std::env;
+use std::fs::canonicalize;
+use std::path::Path;
+use std::process::Command;
 
 use crate::Result;
 

ctest-next/src/runner.rs

@@ -1,10 +1,11 @@
-use crate::{Result, TestGenerator};
 use std::env;
 use std::fs::{canonicalize, File};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
+use crate::{Result, TestGenerator};
+
 /// Generate all tests for the given crate and output the Rust side to a file.
 #[doc(hidden)]
 pub fn generate_test(

ctest-next/src/template.rs

@@ -1,10 +1,10 @@
 use askama::Template;
 use quote::ToTokens;
 
-use crate::{
-    ffi_items::FfiItems, generator::GenerationError, translator::Translator, MapInput, Result,
-    TestGenerator,
-};
+use crate::ffi_items::FfiItems;
+use crate::generator::GenerationError;
+use crate::translator::Translator;
+use crate::{MapInput, Result, TestGenerator};
 
 /// Represents the Rust side of the generated testing suite.
 #[derive(Template, Clone)]

ctest-next/src/tests.rs

@@ -1,7 +1,9 @@
-use crate::{ffi_items::FfiItems, translator::Translator, Result, TranslationError};
-
 use syn::visit::Visit;
 
+use crate::ffi_items::FfiItems;
+use crate::translator::Translator;
+use crate::{Result, TranslationError};
+
 const ALL_ITEMS: &str = r#"
 use std::os::raw::c_void;
 

ctest-next/src/translator.rs

@@ -2,7 +2,8 @@
 //!
 //! Simple to semi complex types are supported only.
 
-use std::{fmt, ops::Deref};
+use std::fmt;
+use std::ops::Deref;
 
 use proc_macro2::Span;
 use quote::ToTokens;

ctest-next/tests/basic.rs

@@ -1,11 +1,8 @@
-use std::{
-    env, fs,
-    path::{Path, PathBuf},
-};
-
-use pretty_assertions::assert_eq;
+use std::path::{Path, PathBuf};
+use std::{env, fs};
 
 use ctest_next::{Result, TestGenerator, __compile_test, __run_test, generate_test};
+use pretty_assertions::assert_eq;
 
 // Headers are found relevative to the include directory, all files are generated
 // relative to the output directory.

libc-test/build.rs

@@ -2849,8 +2849,7 @@ fn test_freebsd(target: &str) {
             "splice" if Some(14) > freebsd_ver => true,
 
             // Those are introduced in FreeBSD 15.
-            "xktls_session_onedir" | "xktls_session"
-                if Some(15) > freebsd_ver => true,
+            "xktls_session_onedir" | "xktls_session" if Some(15) > freebsd_ver => true,
 
             _ => false,
         }