diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs index 8fa4efd..d4c0cdc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,7 +11,7 @@ clippy::nursery, clippy::str_to_string, clippy::unwrap_used, - clippy::integer_arithmetic, + clippy::arithmetic_side_effects, clippy::panic, clippy::unimplemented, clippy::todo, @@ -43,7 +43,7 @@ const DEFAULT_PATHS: &[&str] = &[ fn main() -> Result<()> { env_logger::init(); - jane_eyre::install()?; + color_eyre::install()?; let mut args = Args::from_env_and_args(); #[cfg(feature = "full")] @@ -66,13 +66,12 @@ fn main() -> Result<()> { let mut makefile = Makefile::new(&args); let paths = Default::default(); for filename in &args.makefile { + let macros = makefile.macros.with_overlay(); if filename == &PathBuf::from("-") { - let macros = makefile.macros.with_overlay(); let file = MakefileReader::read(&args, macros, stdin().lock(), "-", Rc::clone(&paths))? .finish(); makefile.extend(file)?; } else { - let macros = makefile.macros.with_overlay(); let file = MakefileReader::read_file(&args, macros, filename, Rc::clone(&paths))?.finish(); makefile.extend(file)?; |