Rustify ci/build_and_test.* scripts

.github/workflows/integration.yml

@@ -74,7 +74,6 @@ jobs:
 
     - name: run integration tests
       env:
-        INTEGRATION: ${{ matrix.integration }}
         TARGET: x86_64-unknown-linux-gnu
-      run: cargo run --bin ci-integration
+      run: cargo run --manifest-path ci/Cargo.toml integration ${{ matrix.integration }}
       continue-on-error: ${{ matrix.allow-failure == true }}

.github/workflows/linux.yml

@@ -36,4 +36,6 @@ jobs:
         rustup target add ${{ matrix.target }}
 
     - name: Build and Test
-      run: ./ci/build_and_test.sh
+      env:
+        RUSTFLAGS: -D warnings
+      run: cargo run --manifest-path ci/Cargo.toml build-and-test

.github/workflows/mac.yml

@@ -32,4 +32,6 @@ jobs:
         rustup target add ${{ matrix.target }}
 
     - name: Build and Test
-      run: ./ci/build_and_test.sh
+      env:
+        RUSTFLAGS: -D warnings
+      run: cargo run --manifest-path ci/Cargo.toml build-and-test

.github/workflows/windows.yml

@@ -58,5 +58,6 @@ jobs:
       shell: bash
 
     - name: Build and Test
-      shell: cmd
-      run: ci\build_and_test.bat
+      env:
+        RUSTFLAGS: -D warnings
+      run: cargo run --manifest-path ci/Cargo.toml build-and-test

.gitignore

@@ -6,6 +6,7 @@
 # will have compiled files and executables
 /target
 tests/cargo-fmt/**/target
+/ci/target
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock

Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-
 name = "rustfmt-nightly"
 version = "1.9.0"
 description = "Tool to find and fix Rust formatting issues"
@@ -26,10 +25,6 @@ path = "src/format-diff/main.rs"
 name = "git-rustfmt"
 path = "src/git-rustfmt/main.rs"
 
-[[bin]]
-name = "ci-integration"
-path = "ci/integration.rs"
-
 [features]
 default = ["cargo-fmt", "rustfmt-format-diff"]
 cargo-fmt = []
@@ -74,4 +69,3 @@ tempfile = "3.23.0"
 [package.metadata.rust-analyzer]
 # This package uses #[feature(rustc_private)]
 rustc_private = true
-

ci/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "ci-integration"
+version = "0.0.1"
+edition = "2024"
+publish = false
+
+[workspace]

ci/src/build_and_test.rs

@@ -0,0 +1,49 @@
+use crate::common::run_command_with_env;
+
+use std::collections::HashMap;
+
+fn run_tests_in_dir(env: &HashMap<&str, &str>, dir: &str) -> Result<(), String> {
+    run_command_with_env("cargo", &["build", "--locked"], dir, &env)?;
+    run_command_with_env("cargo", &["test"], dir, &env)
+}
+
+pub fn runner() -> Result<(), String> {
+    let Ok(rustflags) = std::env::var("RUSTFLAGS") else {
+        return Err(
+            "`RUSTFLAGS` environment variable must be set to run `build-and-test`".to_string(),
+        );
+    };
+    if !rustflags.contains("-D warnings") && !rustflags.contains("-Dwarnings") {
+        return Err(
+            "`RUSTFLAGS` environment variable must contain `-Dwarnings` to run `build-and-test`"
+                .to_string(),
+        );
+    }
+
+    let mut env = HashMap::from([("RUSTFLAGS", "-D warnings"), ("RUSTFMT_CI", "1")]);
+    let value_holder;
+    if let Ok(cfg_release_channel) = std::env::var("CFG_RELEASE_CHANNEL") {
+        value_holder = cfg_release_channel;
+        env.insert("CFG_RELEASE_CHANNEL", value_holder.as_str());
+    }
+
+    // Print version information
+    run_command_with_env("rustc", &["-Vv"], ".", &env)?;
+    run_command_with_env("cargo", &["-v"], ".", &env)?;
+
+    // Build and test main crate
+    let options: &[&str] =
+        if std::env::var("CFG_RELEASE_CHANNEL").is_ok_and(|value| value == "nightly") {
+            &["build", "--locked", "--all-features"]
+        } else {
+            &["build", "--locked"]
+        };
+    run_command_with_env("cargo", options, ".", &env)?;
+    run_command_with_env("cargo", &["test"], ".", &env)?;
+
+    // Build and test config_proc_macro
+    run_tests_in_dir(&env, "config_proc_macro")?;
+    run_tests_in_dir(&env, "check_diff")?;
+
+    Ok(())
+}

ci/src/common.rs

@@ -0,0 +1,87 @@
+use std::collections::HashMap;
+use std::ffi::OsStr;
+use std::path::Path;
+use std::process::Command;
+
+pub fn write_file(file_path: impl AsRef<Path>, content: &str) -> Result<(), String> {
+    std::fs::write(&file_path, content).map_err(|error| {
+        format!(
+            "Failed to create empty `{}` file: {error:?}",
+            file_path.as_ref().display(),
+        )
+    })
+}
+
+pub fn run_command_with_env<I, S>(
+    bin: &str,
+    args: I,
+    current_dir: &str,
+    env: &HashMap<&str, &str>,
+) -> Result<(), String>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<OsStr>,
+{
+    let exit_status = Command::new(bin)
+        .args(args)
+        .envs(env)
+        .current_dir(current_dir)
+        .spawn()
+        .map_err(|error| format!("Failed to spawn command `{bin}`: {error:?}"))?
+        .wait()
+        .map_err(|error| format!("Failed to wait command `{bin}`: {error:?}"))?;
+    if exit_status.success() {
+        Ok(())
+    } else {
+        Err(format!("Command `{bin}` failed"))
+    }
+}
+
+pub fn run_command<I, S>(bin: &str, args: I, current_dir: &str) -> Result<(), String>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<OsStr>,
+{
+    run_command_with_env(bin, args, current_dir, &HashMap::new())
+}
+
+pub struct CommandOutput {
+    pub output: String,
+    pub exited_successfully: bool,
+}
+
+pub fn run_command_with_output_and_env<I, S>(
+    bin: &str,
+    args: I,
+    current_dir: &str,
+    env: &HashMap<&str, &str>,
+) -> Result<CommandOutput, String>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<OsStr>,
+{
+    let cmd_output = Command::new(bin)
+        .args(args)
+        .envs(env)
+        .current_dir(current_dir)
+        .output()
+        .map_err(|error| format!("Failed to spawn command `{bin}`: {error:?}"))?;
+    let mut output = String::from_utf8_lossy(&cmd_output.stdout).into_owned();
+    output.push_str(&String::from_utf8_lossy(&cmd_output.stderr));
+    Ok(CommandOutput {
+        output,
+        exited_successfully: cmd_output.status.success(),
+    })
+}
+
+pub fn run_command_with_output<I, S>(
+    bin: &str,
+    args: I,
+    current_dir: &str,
+) -> Result<CommandOutput, String>
+where
+    I: IntoIterator<Item = S>,
+    S: AsRef<OsStr>,
+{
+    run_command_with_output_and_env(bin, args, current_dir, &HashMap::new())
+}

ci/integration.rs → ci/src/integration.rs

@@ -1,91 +1,10 @@
+use crate::common::{
+    run_command, run_command_with_env, run_command_with_output, run_command_with_output_and_env,
+    write_file,
+};
+
 use std::collections::HashMap;
-use std::env::var;
-use std::ffi::OsStr;
 use std::path::Path;
-use std::process::Command;
-
-fn write_file(file_path: impl AsRef<Path>, content: &str) -> Result<(), String> {
-    std::fs::write(&file_path, content).map_err(|error| {
-        format!(
-            "Failed to create empty `{}` file: {error:?}",
-            file_path.as_ref().display(),
-        )
-    })
-}
-
-fn run_command_with_env<I, S>(
-    bin: &str,
-    args: I,
-    current_dir: &str,
-    env: &HashMap<&str, &str>,
-) -> Result<(), String>
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<OsStr>,
-{
-    let exit_status = Command::new(bin)
-        .args(args)
-        .envs(env)
-        .current_dir(current_dir)
-        .spawn()
-        .map_err(|error| format!("Failed to spawn command `{bin}`: {error:?}"))?
-        .wait()
-        .map_err(|error| format!("Failed to wait command `{bin}`: {error:?}"))?;
-    if exit_status.success() {
-        Ok(())
-    } else {
-        Err(format!("Command `{bin}` failed"))
-    }
-}
-
-fn run_command<I, S>(bin: &str, args: I, current_dir: &str) -> Result<(), String>
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<OsStr>,
-{
-    run_command_with_env(bin, args, current_dir, &HashMap::new())
-}
-
-struct CommandOutput {
-    output: String,
-    exited_successfully: bool,
-}
-
-fn run_command_with_output_and_env<I, S>(
-    bin: &str,
-    args: I,
-    current_dir: &str,
-    env: &HashMap<&str, &str>,
-) -> Result<CommandOutput, String>
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<OsStr>,
-{
-    let cmd_output = Command::new(bin)
-        .args(args)
-        .envs(env)
-        .current_dir(current_dir)
-        .output()
-        .map_err(|error| format!("Failed to spawn command `{bin}`: {error:?}"))?;
-    let mut output = String::from_utf8_lossy(&cmd_output.stdout).into_owned();
-    output.push_str(&String::from_utf8_lossy(&cmd_output.stderr));
-    Ok(CommandOutput {
-        output,
-        exited_successfully: cmd_output.status.success(),
-    })
-}
-
-fn run_command_with_output<I, S>(
-    bin: &str,
-    args: I,
-    current_dir: &str,
-) -> Result<CommandOutput, String>
-where
-    I: IntoIterator<Item = S>,
-    S: AsRef<OsStr>,
-{
-    run_command_with_output_and_env(bin, args, current_dir, &HashMap::new())
-}
 
 // Checks that:
 //
@@ -184,12 +103,9 @@ fn run_test<F: FnOnce(HashMap<&str, &str>, &str) -> Result<(), String>>(
     test_fn(env, integration)
 }
 
-fn runner() -> Result<(), String> {
-    let integration = match var("INTEGRATION") {
-        Ok(value) if !value.is_empty() => value,
-        _ => {
-            return Err("The INTEGRATION environment variable must be set.".into());
-        }
+pub fn runner(args: &mut impl Iterator<Item = String>) -> Result<(), String> {
+    let Some(integration) = args.next() else {
+        return Err("missing command line argument for `integration` checks".to_string());
     };
 
     run_command_with_env(
@@ -239,10 +155,3 @@ fn runner() -> Result<(), String> {
         ),
     }
 }
-
-fn main() {
-    if let Err(error) = runner() {
-        eprintln!("{error}");
-        std::process::exit(1);
-    }
-}