Fix Rust 1.80.0 warnings (#2281)

Cargo.toml

@@ -60,6 +60,22 @@ pretty_assertions = "1.0.0"
 temptree = "0.2.0"
 which = "6.0.0"
 
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+
+[lints.clippy]
+all = { level = "deny", priority = -1 }
+enum_glob_use = "allow"
+needless_pass_by_value = "allow"
+pedantic = { level = "deny", priority = -1 }
+similar_names = "allow"
+struct_excessive_bools = "allow"
+struct_field_names = "allow"
+too_many_arguments = "allow"
+too_many_lines = "allow"
+unnecessary_wraps = "allow"
+wildcard_imports = "allow"
+
 [lib]
 doctest = false
 

src/lib.rs

@@ -1,18 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-#![allow(
-  clippy::enum_glob_use,
-  clippy::let_underscore_untyped,
-  clippy::needless_pass_by_value,
-  clippy::similar_names,
-  clippy::struct_excessive_bools,
-  clippy::struct_field_names,
-  clippy::too_many_arguments,
-  clippy::too_many_lines,
-  clippy::unnecessary_wraps,
-  clippy::wildcard_imports,
-  overlapping_range_endpoints
-)]
-
 //! `just` is primarily used as a command-line binary, but does provide a
 //! limited public library interface.
 //!

tests/error_messages.rs

@@ -81,12 +81,11 @@ fn file_paths_are_relative() {
     .stderr(format!(
       "
 error: Expected '*', ':', '$', identifier, or '+', but found end of file
- ——▶ foo{}bar.just:1:4
+ ——▶ foo{MAIN_SEPARATOR}bar.just:1:4
   │
 1 │ baz
   │    ^
 ",
-      MAIN_SEPARATOR
     ))
     .run();
 }

tests/functions.rs

@@ -2,48 +2,48 @@ use super::*;
 
 test! {
   name:     test_os_arch_functions_in_interpolation,
-  justfile: r#"
+  justfile: r"
 foo:
   echo {{arch()}} {{os()}} {{os_family()}} {{num_cpus()}}
-"#,
+",
   stdout:   format!("{} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
   stderr:   format!("echo {} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
 }
 
 test! {
   name:     test_os_arch_functions_in_expression,
-  justfile: r#"
+  justfile: r"
 a := arch()
 o := os()
 f := os_family()
 n := num_cpus()
 
 foo:
   echo {{a}} {{o}} {{f}} {{n}}
-"#,
+",
   stdout:   format!("{} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
   stderr:   format!("echo {} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
 }
 
 #[cfg(not(windows))]
 test! {
   name:     env_var_functions,
-  justfile: r#"
+  justfile: r"
 p := env_var('USER')
 b := env_var_or_default('ZADDY', 'HTAP')
 x := env_var_or_default('XYZ', 'ABC')
 
 foo:
   /usr/bin/env echo '{{p}}' '{{b}}' '{{x}}'
-"#,
+",
   stdout:   format!("{} HTAP ABC\n", env::var("USER").unwrap()).as_str(),
   stderr:   format!("/usr/bin/env echo '{}' 'HTAP' 'ABC'\n", env::var("USER").unwrap()).as_str(),
 }
 
 #[cfg(not(windows))]
 test! {
   name: path_functions,
-  justfile: r#"
+  justfile: r"
 we  := without_extension('/foo/bar/baz.hello')
 fs  := file_stem('/foo/bar/baz.hello')
 fn  := file_name('/foo/bar/baz.hello')
@@ -53,15 +53,15 @@ jn  := join('a', 'b')
 
 foo:
   /usr/bin/env echo '{{we}}' '{{fs}}' '{{fn}}' '{{dir}}' '{{ext}}' '{{jn}}'
-"#,
+",
   stdout:   "/foo/bar/baz baz baz.hello /foo/bar hello a/b\n",
   stderr:   "/usr/bin/env echo '/foo/bar/baz' 'baz' 'baz.hello' '/foo/bar' 'hello' 'a/b'\n",
 }
 
 #[cfg(not(windows))]
 test! {
   name: path_functions2,
-  justfile: r#"
+  justfile: r"
 we  := without_extension('/foo/bar/baz')
 fs  := file_stem('/foo/bar/baz.hello.ciao')
 fn  := file_name('/bar/baz.hello.ciao')
@@ -70,20 +70,20 @@ ext := extension('/foo/bar/baz.hello.ciao')
 
 foo:
   /usr/bin/env echo '{{we}}' '{{fs}}' '{{fn}}' '{{dir}}' '{{ext}}'
-"#,
+",
   stdout:   "/foo/bar/baz baz.hello baz.hello.ciao / ciao\n",
   stderr:   "/usr/bin/env echo '/foo/bar/baz' 'baz.hello' 'baz.hello.ciao' '/' 'ciao'\n",
 }
 
 #[cfg(not(windows))]
 test! {
   name: broken_without_extension_function,
-  justfile: r#"
+  justfile: r"
 we  := without_extension('')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{} {}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `without_extension` failed:",
@@ -98,12 +98,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_extension_function,
-  justfile: r#"
+  justfile: r"
 we  := extension('')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `extension` failed: Could not extract extension from ``",
@@ -117,12 +117,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_extension_function2,
-  justfile: r#"
+  justfile: r"
 we  := extension('foo')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `extension` failed: Could not extract extension from `foo`",
@@ -136,12 +136,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_file_stem_function,
-  justfile: r#"
+  justfile: r"
 we  := file_stem('')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `file_stem` failed: Could not extract file stem from ``",
@@ -155,12 +155,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_file_name_function,
-  justfile: r#"
+  justfile: r"
 we  := file_name('')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `file_name` failed: Could not extract file name from ``",
@@ -174,12 +174,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_directory_function,
-  justfile: r#"
+  justfile: r"
 we  := parent_directory('')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{} {}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `parent_directory` failed:",
@@ -194,12 +194,12 @@ foo:
 #[cfg(not(windows))]
 test! {
   name: broken_directory_function2,
-  justfile: r#"
+  justfile: r"
 we  := parent_directory('/')
 
 foo:
   /usr/bin/env echo '{{we}}'
-"#,
+",
   stdout:   "",
   stderr:   format!("{} {}\n{}\n{}\n{}\n{}\n",
     "error: Call to function `parent_directory` failed:",
@@ -254,10 +254,10 @@ test! {
 
 test! {
   name:     test_os_arch_functions_in_default,
-  justfile: r#"
+  justfile: r"
 foo a=arch() o=os() f=os_family() n=num_cpus():
   echo {{a}} {{o}} {{f}} {{n}}
-"#,
+",
   stdout:   format!("{} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
   stderr:   format!("echo {} {} {} {}\n", target::arch(), target::os(), target::family(), num_cpus::get()).as_str(),
 }
@@ -664,7 +664,7 @@ fn uuid() {
 #[test]
 fn choose() {
   Test::new()
-    .justfile(r#"x := choose('10', 'xXyYzZ')"#)
+    .justfile(r"x := choose('10', 'xXyYzZ')")
     .args(["--evaluate", "x"])
     .stdout_regex("^[X-Zx-z]{10}$")
     .run();

tests/interrupts.rs

@@ -5,7 +5,7 @@ use {
 
 fn kill(process_id: u32) {
   unsafe {
-    libc::kill(process_id as i32, libc::SIGINT);
+    libc::kill(process_id.try_into().unwrap(), libc::SIGINT);
   }
 }
 
@@ -31,13 +31,15 @@ fn interrupt_test(arguments: &[&str], justfile: &str) {
 
   let elapsed = start.elapsed();
 
-  if elapsed > Duration::from_secs(2) {
-    panic!("process returned too late: {elapsed:?}");
-  }
+  assert!(
+    elapsed <= Duration::from_secs(2),
+    "process returned too late: {elapsed:?}"
+  );
 
-  if elapsed < Duration::from_millis(100) {
-    panic!("process returned too early : {elapsed:?}");
-  }
+  assert!(
+    elapsed >= Duration::from_millis(100),
+    "process returned too early : {elapsed:?}"
+  );
 
   assert_eq!(status.code(), Some(130));
 }

tests/invocation_directory.rs

@@ -78,9 +78,7 @@ fn test_invocation_directory() {
     failure = true;
   }
 
-  if failure {
-    panic!("test failed");
-  }
+  assert!(!failure, "test failed");
 }
 
 #[test]