Check Rust code formatting in CI (#7640)

Author: cknitt

rewatch/src/build.rs

@@ -56,10 +56,7 @@ pub struct CompilerArgs {
     pub parser_args: Vec<String>,
 }
 
-pub fn get_compiler_args(
-    path: &Path,
-    build_dev_deps: bool,
-) -> Result<String> {
+pub fn get_compiler_args(path: &Path, build_dev_deps: bool) -> Result<String> {
     let filename = &helpers::get_abs_path(path);
     let package_root =
         helpers::get_abs_path(&helpers::get_nearest_config(&path).expect("Couldn't find package root"));
@@ -171,13 +168,7 @@ pub fn initialize_build(
         let _ = stdout().flush();
     }
 
-    let mut build_state = BuildState::new(
-        project_root,
-        root_config_name,
-        packages,
-        workspace_root,
-        bsc_path,
-    );
+    let mut build_state = BuildState::new(project_root, root_config_name, packages, workspace_root, bsc_path);
     packages::parse_packages(&mut build_state);
     let timing_source_files_elapsed = timing_source_files.elapsed();
 

rewatch/src/build/clean.rs

@@ -354,7 +354,6 @@ pub fn clean(
         None => helpers::get_bsc(&project_root, &workspace_root),
     };
 
-
     let timing_clean_compiler_assets = Instant::now();
     if !snapshot_output && show_progress {
         print!(

rewatch/src/lock.rs

@@ -21,7 +21,10 @@ pub enum Error {
 impl std::fmt::Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let msg = match self {
-            Error::Locked(pid) => format!("A ReScript build is already running. The process ID (PID) is {}", pid),
+            Error::Locked(pid) => format!(
+                "A ReScript build is already running. The process ID (PID) is {}",
+                pid
+            ),
             Error::ParsingLockfile(e) => format!(
                 "Could not parse lockfile: \n {} \n  (try removing it and running the command again)",
                 e

rewatch/src/main.rs

@@ -27,17 +27,8 @@ fn main() -> Result<()> {
     let show_progress = log_level_filter == LevelFilter::Info;
 
     match command.clone() {
-        cli::Command::CompilerArgs {
-            path,
-            dev,
-        } => {
-            println!(
-                "{}",
-                build::get_compiler_args(
-                    Path::new(&path),
-                    *dev
-                )?
-            );
+        cli::Command::CompilerArgs { path, dev } => {
+            println!("{}", build::get_compiler_args(Path::new(&path), *dev)?);
             std::process::exit(0);
         }
         cli::Command::Build(build_args) => {

rewatch/src/watcher.rs

@@ -5,12 +5,12 @@ use crate::cmd;
 use crate::helpers;
 use crate::helpers::StrippedVerbatimPath;
 use crate::helpers::emojis::*;
+use crate::lock::LOCKFILE;
 use crate::queue::FifoQueue;
 use crate::queue::*;
 use futures_timer::Delay;
 use notify::event::ModifyKind;
 use notify::{Config, Error, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher};
-use crate::lock::LOCKFILE;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::Mutex;

scripts/format.sh

@@ -2,9 +2,17 @@
 
 shopt -s extglob
 
+echo Formatting OCaml code...
 dune build @fmt --auto-promote
 
+echo Formatting ReScript code...
 files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -name "generated_mocha_test.res" ! -path "tests/syntax_tests*" ! -path "tests/analysis_tests/tests*" ! -path "*/node_modules/*")
 ./cli/rescript-legacy.js format $files
 
+echo Formatting JS code...
 yarn format
+
+echo Formatting Rust code...
+cargo fmt --manifest-path rewatch/Cargo.toml
+
+echo Done.

scripts/format_check.sh

@@ -30,5 +30,18 @@ case "$(uname -s)" in
     echo "Code formatting checks skipped for this platform."
 esac
 
-echo "Biome format check"
-yarn check
+echo "Checking JS code formatting..."
+if yarn check; then
+  printf "${successGreen}✅ JS code formatting ok.${reset}\n"
+else
+  printf "${warningYellow}⚠️ JS code formatting issues found.${reset}\n"
+  exit 1
+fi
+
+echo "Checking Rust code formatting..."
+if cargo fmt --check --manifest-path rewatch/Cargo.toml; then
+  printf "${successGreen}✅ Rust code formatting ok.${reset}\n"
+else
+  printf "${warningYellow}⚠️ Rust code formatting issues found.${reset}\n"
+  exit 1
+fi