Skip to content

Commit

Permalink
Fix some Clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
hillu committed Nov 26, 2023
1 parent 40bb16b commit d45d06a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::fs;
use std::io::prelude::*;
use std::io::BufReader;
use std::iter::FromIterator;
use std::path::{Path, PathBuf};
use std::path::Path;
use std::string::String;

extern crate bindgen;
Expand Down Expand Up @@ -127,7 +127,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.replace("/* @SYSCALL_BUILD@ */", &gen_syscall()?)
.into_bytes();

fs::write(&dest_path, &buf)?;
fs::write(dest_path, buf)?;

// sockaddr
bindgen::Builder::default()
Expand All @@ -138,7 +138,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.layout_tests(false)
.generate()
.expect("unable to generate bindings")
.write_to_file(PathBuf::from(env::var("OUT_DIR").unwrap()).join("sockaddr.rs"))
.write_to_file(std::path::PathBuf::from(env::var("OUT_DIR").unwrap()).join("sockaddr.rs"))
.expect("Couldn't write bindings!");

println!("cargo:rerun-if-changed=build.rs");
Expand Down
12 changes: 6 additions & 6 deletions src/bin/laurel/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ impl Logger {
prefix: def.line_prefix.clone(),
output: BufWriter::new(Box::new(io::stdout())),
}),
p if p.has_root() && p.parent() != None => Err(format!(
p if p.has_root() && p.parent().is_none() => Err(format!(
"invalid file directory={} file={}",
dir.to_string_lossy(),
p.to_string_lossy()
)
.into()),
p => {
let mut filename = dir.to_path_buf();
filename.push(&p);
filename.push(p);
let mut rot = FileRotate::new(filename);
for user in &def.clone().users.unwrap_or_default() {
rot = rot.with_uid(
Expand Down Expand Up @@ -303,17 +303,17 @@ fn run_app() -> Result<(), Box<dyn Error>> {
.map_err(|e| format!("can't create filterlog logger: {}", e))?;
emit_fn_log = move |e: &Event| {
if e.filter {
filter_logger.log(&e)
filter_logger.log(e)
} else {
logger.log(&e)
logger.log(e)
}
};
coalesce = Coalesce::new(emit_fn_log);
} else {
log::info!("Dropping filtered audit records");
emit_fn_drop = move |e: &Event| {
if !e.filter {
logger.log(&e)
logger.log(e)
}
};
coalesce = Coalesce::new(emit_fn_drop);
Expand Down Expand Up @@ -442,7 +442,7 @@ fn run_app() -> Result<(), Box<dyn Error>> {
}

pub fn main() {
log::set_boxed_logger(Box::new(logger::Logger::default())).unwrap();
log::set_boxed_logger(Box::<logger::Logger>::default()).unwrap();
log::set_max_level(log::LevelFilter::Info);

{
Expand Down
4 changes: 2 additions & 2 deletions src/coalesce.rs
Original file line number Diff line number Diff line change
Expand Up @@ -879,12 +879,12 @@ impl<'a> Coalesce<'a> {
.push((Key::Literal("ID"), Value::Str(r, Quote::None)));
}
if let Some(comm) = &parent.comm {
let r = pi.put(&comm);
let r = pi.put(comm);
pi.elems
.push((Key::Literal("comm"), Value::Str(r, Quote::None)));
}
if let Some(exe) = &parent.exe {
let r = pi.put(&exe);
let r = pi.put(exe);
pi.elems
.push((Key::Literal("exe"), Value::Str(r, Quote::None)));
}
Expand Down
2 changes: 1 addition & 1 deletion src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ impl Debug for Record {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut seq = f.debug_struct("Record");
for (k, v) in self {
seq.field(&*k.to_string(), &v);
seq.field(&k.to_string(), &v);
}
seq.finish()
}
Expand Down

0 comments on commit d45d06a

Please sign in to comment.