Merge pull request #98 from rust-fuzz/revert-94-rustfmt

Revert "Format with rustfmt"

Author: PaulGrandperrin

.github/workflows/rust.yml

@@ -23,7 +23,7 @@ jobs:
       run: sudo apt-get install --no-install-recommends build-essential binutils-dev libunwind-dev libblocksruntime-dev liblzma-dev
     - name: Test
       run: ./test.sh
-
+  
 #  ubuntu-beta:
 #    runs-on: ubuntu-24.04
 #    steps:
@@ -37,7 +37,7 @@ jobs:
 #      run: sudo apt-get install --no-install-recommends build-essential binutils-dev libunwind-dev libblocksruntime-dev liblzma-dev
 #    - name: Test
 #      run: ./test.sh
-
+      
   ubuntu-stable:
     runs-on: ubuntu-24.04
     steps:

build.rs

@@ -5,37 +5,24 @@ use std::process::{self, Command};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
-#[cfg(target_family = "windows")]
+#[cfg(target_family="windows")]
 compile_error!("honggfuzz-rs does not currently support Windows but works well under WSL (Windows Subsystem for Linux)");
 
 // TODO: maybe use `make-cmd` crate
-#[cfg(not(any(
-    target_os = "freebsd",
-    target_os = "dragonfly",
-    target_os = "bitrig",
-    target_os = "openbsd",
-    target_os = "netbsd"
-)))]
+#[cfg(not(any(target_os = "freebsd", target_os = "dragonfly", target_os = "bitrig", target_os = "openbsd", target_os = "netbsd")))]
 const GNU_MAKE: &str = "make";
-#[cfg(any(
-    target_os = "freebsd",
-    target_os = "dragonfly",
-    target_os = "bitrig",
-    target_os = "openbsd",
-    target_os = "netbsd"
-))]
+#[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_os = "bitrig", target_os = "openbsd", target_os = "netbsd"))]
 const GNU_MAKE: &str = "gmake";
 
 fn main() {
     // Only build honggfuzz binaries if we are in the process of building an instrumentized binary
     let honggfuzz_target = match env::var("CARGO_HONGGFUZZ_TARGET_DIR") {
         Ok(path) => path, // path where to place honggfuzz binary. provided by cargo-hfuzz command.
-        Err(_) => return,
+        Err(_) => return
     };
 
     // check that "cargo hfuzz" command is at the same version as this file
-    let honggfuzz_build_version =
-        env::var("CARGO_HONGGFUZZ_BUILD_VERSION").unwrap_or("unknown".to_string());
+    let honggfuzz_build_version = env::var("CARGO_HONGGFUZZ_BUILD_VERSION").unwrap_or("unknown".to_string());
     if VERSION != honggfuzz_build_version {
         eprintln!("The version of the honggfuzz library dependency ({0}) and the version of the `cargo-hfuzz` executable ({1}) do not match.\n\
                    If updating both by running `cargo update` and `cargo install honggfuzz` does not work, you can either:\n\
@@ -65,11 +52,7 @@ fn main() {
     assert!(status.success());
 
     fs::copy("honggfuzz/libhfuzz/libhfuzz.a", out_dir.join("libhfuzz.a")).unwrap();
-    fs::copy(
-        "honggfuzz/libhfcommon/libhfcommon.a",
-        out_dir.join("libhfcommon.a"),
-    )
-    .unwrap();
+    fs::copy("honggfuzz/libhfcommon/libhfcommon.a", out_dir.join("libhfcommon.a")).unwrap();
     fs::copy("honggfuzz/honggfuzz", honggfuzz_target.join("honggfuzz")).unwrap();
 
     // tell cargo how to link final executable to hfuzz static library

example/src/main.rs

@@ -1,7 +1,7 @@
 use honggfuzz::fuzz;
 
 fn main() {
-    // Here you can parse `std::env::args and
+    // Here you can parse `std::env::args and 
     // setup / initialize your project
 
     // You should avoid as much as possible global states.
@@ -28,7 +28,7 @@ fn main() {
             if data[2] != b'y' {return}
             panic!("BOOM")
         });
-
+            
         // The fuzz macro gives an arbitrary object (see `arbitrary crate`)
         // to a closure-like block of code if you set the `arbitrary` feature.
         // Here, this tuple will contain two "random" values of different type.

example/test.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -vex
 export RUST_BACKTRACE=full
 
-CARGO_HFUZZ=${CARGO_HFUZZ:-"cargo hfuzz"} # by default, use regular subcommand. Override to force using another version (for tests)
+CARGO_HFUZZ=${CARGO_HFUZZ:-"cargo hfuzz"} # by default, use regular subcommand. Override to force using another version (for tests) 
 
 cargo clean
 

src/bin/cargo-hfuzz.rs

@@ -208,14 +208,15 @@ where
 
     // HACK: temporary fix, see https://github.com/rust-lang/rust/issues/53945#issuecomment-426824324
     let use_gold_linker: bool = match Command::new("which") // check if the gold linker is available
-        .args(&["ld.gold"])
-        .status()
-    {
+            .args(&["ld.gold"])
+            .status() {
         Err(_) => false,
-        Ok(status) => match status.code() {
-            Some(0) => true,
-            _ => false,
-        },
+        Ok(status) => {
+            match status.code() {
+                Some(0) => true,
+                _       => false
+            }
+        }
     };
 
     let mut rustflags = "\
@@ -270,19 +271,15 @@ where
                 // compilers for which the LLVM version is >= 13.
                 let version_meta = rustc_version::version_meta().unwrap();
                 if version_meta.llvm_version.map_or(true, |v| v.major >= 13) {
-                    rustflags.push_str(
-                        "\
+                    rustflags.push_str("\
                     -C passes=sancov-module \
-                    ",
-                    );
+                    ");
                 } else {
-                    rustflags.push_str(
-                        "\
+                    rustflags.push_str("\
                     -C passes=sancov \
-                    ",
-                    );
+                    ");
                 };
-
+                
                 rustflags.push_str(
                     "\
                 -C llvm-args=-sanitizer-coverage-level=4 \

src/bin/cargo-honggfuzz.rs

@@ -1,10 +1,10 @@
 use std::env;
-use std::os::unix::process::CommandExt;
 use std::process::{self, Command};
+use std::os::unix::process::CommandExt;
 
 const HONGGFUZZ_TARGET: &str = "hfuzz_target";
 
-#[cfg(target_family = "windows")]
+#[cfg(target_family="windows")]
 compile_error!("honggfuzz-rs does not currently support Windows but works well under WSL (Windows Subsystem for Linux)");
 
 fn main() {
@@ -29,9 +29,6 @@ fn main() {
         .exec();
 
     // code flow will only reach here if honggfuzz failed to execute
-    eprintln!(
-        "cannot execute {}, try to execute \"cargo hfuzz build\" from fuzzed project directory",
-        &command,
-    );
+    eprintln!("cannot execute {}, try to execute \"cargo hfuzz build\" from fuzzed project directory", &command);
     process::exit(1);
 }