From 58233202060b4f1d2d81fc6047141b9aea508331 Mon Sep 17 00:00:00 2001 From: Dominik Maier Date: Fri, 2 Sep 2022 16:21:06 +0200 Subject: [PATCH] Fixes for new Clippy (#755) --- libafl/src/bolts/fs.rs | 6 +++--- libafl/src/bolts/os/unix_shmem_server.rs | 7 +++---- libafl/src/monitors/mod.rs | 4 +--- libafl/src/mutators/token_mutations.rs | 2 +- libafl/src/state/mod.rs | 2 +- libafl_cc/build.rs | 4 ++-- libafl_cc/src/clang.rs | 2 +- libafl_concolic/symcc_libafl/src/lib.rs | 4 ++-- libafl_concolic/test/dump_constraints/src/main.rs | 2 +- 9 files changed, 15 insertions(+), 18 deletions(-) diff --git a/libafl/src/bolts/fs.rs b/libafl/src/bolts/fs.rs index 27911b2a30..8610554cf8 100644 --- a/libafl/src/bolts/fs.rs +++ b/libafl/src/bolts/fs.rs @@ -154,9 +154,9 @@ mod test { #[test] fn test_atomic_file_write() { let path = "test_atomic_file_write.tmp"; - write_file_atomic(&path, b"test").unwrap(); - let content = fs::read_to_string(&path).unwrap(); - fs::remove_file(&path).unwrap(); + write_file_atomic(path, b"test").unwrap(); + let content = fs::read_to_string(path).unwrap(); + fs::remove_file(path).unwrap(); assert_eq!(content, "test"); } diff --git a/libafl/src/bolts/os/unix_shmem_server.rs b/libafl/src/bolts/os/unix_shmem_server.rs index d630e71888..1b338b9cfd 100644 --- a/libafl/src/bolts/os/unix_shmem_server.rs +++ b/libafl/src/bolts/os/unix_shmem_server.rs @@ -14,7 +14,6 @@ use core::{mem::ManuallyDrop, ptr::addr_of}; #[cfg(target_vendor = "apple")] use std::fs; use std::{ - borrow::BorrowMut, cell::RefCell, env, io::{Read, Write}, @@ -225,8 +224,8 @@ where fn post_fork(&mut self, is_child: bool) -> Result<(), Error> { if is_child { // After fork, only the parent keeps the join handle. - if let ShMemService::Started { bg_thread, .. } = &mut self.service { - bg_thread.borrow_mut().lock().unwrap().join_handle = None; + if let ShMemService::Started { bg_thread, .. } = &self.service { + bg_thread.lock().unwrap().join_handle = None; } //fn connect(&mut self) -> Result { //self.stream = UnixStream::connect_to_unix_addr(&UnixSocketAddr::new(UNIX_SERVER_NAME)?)?, @@ -371,7 +370,7 @@ impl Drop for ShMemServiceThread { .expect("Error in ShMemService background thread!"); // try to remove the file from fs, and ignore errors. #[cfg(target_vendor = "apple")] - fs::remove_file(&UNIX_SERVER_NAME).unwrap(); + fs::remove_file(UNIX_SERVER_NAME).unwrap(); env::remove_var(AFL_SHMEM_SERVICE_STARTED); } diff --git a/libafl/src/monitors/mod.rs b/libafl/src/monitors/mod.rs index ec2a658cc0..b846b74aea 100644 --- a/libafl/src/monitors/mod.rs +++ b/libafl/src/monitors/mod.rs @@ -9,8 +9,6 @@ pub mod tui; #[cfg(feature = "std")] pub mod disk; -#[cfg(feature = "introspection")] -use alloc::string::ToString; use alloc::{fmt::Debug, string::String, vec::Vec}; use core::{fmt, time::Duration}; @@ -346,7 +344,7 @@ where (self.print_fn)(fmt); // Separate the spacing just a bit - (self.print_fn)("".to_string()); + (self.print_fn)(String::new()); } } } diff --git a/libafl/src/mutators/token_mutations.rs b/libafl/src/mutators/token_mutations.rs index d33caa9df6..878a869a2d 100644 --- a/libafl/src/mutators/token_mutations.rs +++ b/libafl/src/mutators/token_mutations.rs @@ -623,7 +623,7 @@ token1="A\x41A" token2="B" "###; fs::write("test.tkns", data).expect("Unable to write test.tkns"); - let tokens = Tokens::from_file(&"test.tkns").unwrap(); + let tokens = Tokens::from_file("test.tkns").unwrap(); #[cfg(feature = "std")] println!("Token file entries: {:?}", tokens.tokens()); assert_eq!(tokens.tokens().len(), 2); diff --git a/libafl/src/state/mod.rs b/libafl/src/state/mod.rs index 0bc51ec715..b9715e02ff 100644 --- a/libafl/src/state/mod.rs +++ b/libafl/src/state/mod.rs @@ -436,7 +436,7 @@ where manager, in_dir, forced, - &mut |_, _, path| I::from_file(&path), + &mut |_, _, path| I::from_file(path), )?; } manager.fire( diff --git a/libafl_cc/build.rs b/libafl_cc/build.rs index 4b5df32dfd..e0142525a8 100644 --- a/libafl_cc/build.rs +++ b/libafl_cc/build.rs @@ -92,7 +92,7 @@ fn exec_llvm_config(args: &[&str]) -> String { /// Use `xcrun` to get the path to the Xcode SDK tools library path, for linking fn find_macos_sdk_libs() -> String { let sdk_path_out = Command::new("xcrun") - .args(&["--show-sdk-path"]) + .arg("--show-sdk-path") .output() .expect("Failed to execute xcrun. Make sure you have Xcode installed and executed `sudo xcode-select --install`"); format!( @@ -129,7 +129,7 @@ fn build_pass( .args(cxxflags) .arg(src_dir.join(src_file)) .args(ldflags) - .args(&["-o"]) + .arg("-o") .arg(out_dir.join(format!("{}.{}", src_stub, dll_extension()))) .status() .unwrap_or_else(|_| panic!("Failed to compile {}", src_file)) diff --git a/libafl_cc/src/clang.rs b/libafl_cc/src/clang.rs index 875febece9..c4c7ab695a 100644 --- a/libafl_cc/src/clang.rs +++ b/libafl_cc/src/clang.rs @@ -377,7 +377,7 @@ impl ClangWrapper { optimize: true, wrapped_cc: CLANG_PATH.into(), wrapped_cxx: CLANGXX_PATH.into(), - name: "".into(), + name: String::new(), is_cpp: false, linking: false, shared: false, diff --git a/libafl_concolic/symcc_libafl/src/lib.rs b/libafl_concolic/symcc_libafl/src/lib.rs index b29be4f93e..013b8a6ed7 100644 --- a/libafl_concolic/symcc_libafl/src/lib.rs +++ b/libafl_concolic/symcc_libafl/src/lib.rs @@ -27,11 +27,11 @@ mod clone { ); let mut cmd = Command::new("git"); - cmd.arg("clone").arg(url).arg(&path); + cmd.arg("clone").arg(url).arg(path); let output = cmd.output().expect("failed to execute git clone"); if output.status.success() { let mut cmd = Command::new("git"); - cmd.arg("checkout").arg(commit).current_dir(&path); + cmd.arg("checkout").arg(commit).current_dir(path); let output = cmd.output().expect("failed to execute git checkout"); if !output.status.success() { println!("failed to checkout symcc git repository commit:"); diff --git a/libafl_concolic/test/dump_constraints/src/main.rs b/libafl_concolic/test/dump_constraints/src/main.rs index 684dac22f5..d4f6017b5f 100644 --- a/libafl_concolic/test/dump_constraints/src/main.rs +++ b/libafl_concolic/test/dump_constraints/src/main.rs @@ -97,7 +97,7 @@ fn main() { std::env::set_var(EXPRESSION_PRUNING, "1"); } - let res = Command::new(&opt.program.first().expect("no program argument given")) + let res = Command::new(opt.program.first().expect("no program argument given")) .args(opt.program.iter().skip(1)) .status() .expect("failed to spawn program");