Eliminate lazy_static (#1442)

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         components: clippy, rustfmt
-        toolchain: 1.56.0
+        toolchain: stable
 
     - uses: Swatinem/rust-cache@v1
 
@@ -63,7 +63,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         profile: minimal
-        toolchain: 1.56.0
+        toolchain: stable
 
     - uses: Swatinem/rust-cache@v1
 
@@ -123,7 +123,7 @@ jobs:
       with:
         components: clippy, rustfmt
         override: true
-        toolchain: 1.56.0
+        toolchain: stable
 
     - uses: Swatinem/rust-cache@v1
 

Cargo.toml

@@ -27,7 +27,6 @@ dotenvy = "0.15"
 edit-distance = "2.0.0"
 env_logger = "0.9.3"
 heck = "0.4.0"
-lazy_static = "1.0.0"
 lexiclean = "0.0.1"
 libc = "0.2.0"
 log = "0.4.4"

README.md

@@ -2421,7 +2421,7 @@ Before merging a particularly large or gruesome change, Janus should be run to m
 
 ### Minimum Supported Rust Version
 
-The minimum supported Rust version, or MSRV, is Rust 1.56.0.
+The minimum supported Rust version, or MSRV, is current stable Rust. It may build on older versions of Rust, but this is not guaranteed.
 
 ### New Releases
 

bin/generate-book/src/main.rs

@@ -165,7 +165,7 @@ fn main() -> Result {
 
     for chapter in chapters {
       let path = format!("{}/chapter_{}.md", src, chapter.number());
-      fs::write(&path, &chapter.markdown()?)?;
+      fs::write(path, chapter.markdown()?)?;
       let indent = match chapter.level {
         HeadingLevel::H1 => 0,
         HeadingLevel::H2 => 1,

src/assignment_resolver.rs

@@ -36,7 +36,7 @@ impl<'src: 'run, 'run> AssignmentResolver<'src, 'run> {
       self.resolve_expression(&assignment.value)?;
       self.evaluated.insert(name);
     } else {
-      let message = format!("attempted to resolve unknown assignment `{}`", name);
+      let message = format!("attempted to resolve unknown assignment `{name}`");
       let token = Token {
         src: "",
         offset: 0,

src/ast.rs

@@ -16,7 +16,7 @@ impl<'src> Display for Ast<'src> {
     let mut iter = self.items.iter().peekable();
 
     while let Some(item) = iter.next() {
-      writeln!(f, "{}", item)?;
+      writeln!(f, "{item}")?;
 
       if let Some(next_item) = iter.peek() {
         if matches!(item, Item::Recipe(_))

src/compile_error.rs

@@ -39,7 +39,7 @@ impl Display for CompileError<'_> {
       }
       CircularRecipeDependency { recipe, ref circle } => {
         if circle.len() == 2 {
-          write!(f, "Recipe `{}` depends on itself", recipe)?;
+          write!(f, "Recipe `{recipe}` depends on itself")?;
         } else {
           write!(
             f,
@@ -54,7 +54,7 @@ impl Display for CompileError<'_> {
         ref circle,
       } => {
         if circle.len() == 2 {
-          write!(f, "Variable `{}` is defined in terms of itself", variable)?;
+          write!(f, "Variable `{variable}` is defined in terms of itself")?;
         } else {
           write!(
             f,
@@ -80,11 +80,11 @@ impl Display for CompileError<'_> {
 
         if min == max {
           let expected = min;
-          write!(f, "{} {}", expected, Count("argument", *expected))?;
+          write!(f, "{expected} {}", Count("argument", *expected))?;
         } else if found < min {
-          write!(f, "at least {} {}", min, Count("argument", *min))?;
+          write!(f, "at least {min} {}", Count("argument", *min))?;
         } else {
-          write!(f, "at most {} {}", max, Count("argument", *max))?;
+          write!(f, "at most {max} {}", Count("argument", *max))?;
         }
       }
       DuplicateAlias { alias, first } => {
@@ -131,7 +131,7 @@ impl Display for CompileError<'_> {
         )?;
       }
       DuplicateVariable { variable } => {
-        write!(f, "Variable `{}` has multiple definitions", variable)?;
+        write!(f, "Variable `{variable}` has multiple definitions")?;
       }
       ExpectedKeyword { expected, found } => {
         if found.kind == TokenKind::Identifier {
@@ -192,7 +192,7 @@ impl Display for CompileError<'_> {
           '"' => r#"""#.to_owned(),
           _ => character.escape_default().collect(),
         };
-        write!(f, "`\\{}` is not a valid escape sequence", representation)?;
+        write!(f, "`\\{representation}` is not a valid escape sequence")?;
       }
       MismatchedClosingDelimiter {
         open,
@@ -216,13 +216,12 @@ impl Display for CompileError<'_> {
         )?;
       }
       ParameterFollowsVariadicParameter { parameter } => {
-        write!(f, "Parameter `{}` follows variadic parameter", parameter)?;
+        write!(f, "Parameter `{parameter}` follows variadic parameter")?;
       }
       ParameterShadowsVariable { parameter } => {
         write!(
           f,
-          "Parameter `{}` shadows variable of the same name",
-          parameter
+          "Parameter `{parameter}` shadows variable of the same name",
         )?;
       }
       ParsingRecursionDepthExceeded => {
@@ -236,41 +235,37 @@ impl Display for CompileError<'_> {
         )?;
       }
       UndefinedVariable { variable } => {
-        write!(f, "Variable `{}` not defined", variable)?;
+        write!(f, "Variable `{variable}` not defined")?;
       }
       UnexpectedCharacter { expected } => {
-        write!(f, "Expected character `{}`", expected)?;
+        write!(f, "Expected character `{expected}`")?;
       }
       UnexpectedClosingDelimiter { close } => {
         write!(f, "Unexpected closing delimiter `{}`", close.close())?;
       }
       UnexpectedEndOfToken { expected } => {
-        write!(f, "Expected character `{}` but found end-of-file", expected)?;
+        write!(f, "Expected character `{expected}` but found end-of-file")?;
       }
       UnexpectedToken {
         ref expected,
         found,
       } => {
-        write!(f, "Expected {}, but found {}", List::or(expected), found)?;
+        write!(f, "Expected {}, but found {found}", List::or(expected))?;
       }
       UnknownAliasTarget { alias, target } => {
-        write!(f, "Alias `{}` has an unknown target `{}`", alias, target)?;
+        write!(f, "Alias `{alias}` has an unknown target `{target}`")?;
       }
       UnknownAttribute { attribute } => {
-        write!(f, "Unknown attribute `{}`", attribute)?;
+        write!(f, "Unknown attribute `{attribute}`")?;
       }
       UnknownDependency { recipe, unknown } => {
-        write!(
-          f,
-          "Recipe `{}` has unknown dependency `{}`",
-          recipe, unknown
-        )?;
+        write!(f, "Recipe `{recipe}` has unknown dependency `{unknown}`",)?;
       }
       UnknownFunction { function } => {
-        write!(f, "Call to unknown function `{}`", function)?;
+        write!(f, "Call to unknown function `{function}`")?;
       }
       UnknownSetting { setting } => {
-        write!(f, "Unknown setting `{}`", setting)?;
+        write!(f, "Unknown setting `{setting}`")?;
       }
       UnknownStartOfToken => {
         write!(f, "Unknown start of token:")?;

src/config.rs

@@ -388,7 +388,7 @@ impl Config {
       arg::COLOR_ALWAYS => Ok(Color::always()),
       arg::COLOR_NEVER => Ok(Color::never()),
       _ => Err(ConfigError::Internal {
-        message: format!("Invalid argument `{}` to --color.", value),
+        message: format!("Invalid argument `{value}` to --color."),
       }),
     }
   }
@@ -404,7 +404,7 @@ impl Config {
       arg::DUMP_FORMAT_JSON => Ok(DumpFormat::Json),
       arg::DUMP_FORMAT_JUST => Ok(DumpFormat::Just),
       _ => Err(ConfigError::Internal {
-        message: format!("Invalid argument `{}` to --dump-format.", value),
+        message: format!("Invalid argument `{value}` to --dump-format."),
       }),
     }
   }

src/config_error.rs

@@ -28,7 +28,7 @@ pub(crate) enum ConfigError {
   #[snafu(display(
       "`--{}` used with unexpected overrides: {}",
       subcommand.to_lowercase(),
-      List::and_ticked(overrides.iter().map(|(key, value)| format!("{}={}", key, value))),
+      List::and_ticked(overrides.iter().map(|(key, value)| format!("{key}={value}"))),
   ))]
   SubcommandOverrides {
     subcommand: &'static str,
@@ -37,7 +37,7 @@ pub(crate) enum ConfigError {
   #[snafu(display(
       "`--{}` used with unexpected overrides: {}; and arguments: {}",
       subcommand.to_lowercase(),
-      List::and_ticked(overrides.iter().map(|(key, value)| format!("{}={}", key, value))),
+      List::and_ticked(overrides.iter().map(|(key, value)| format!("{key}={value}"))),
       List::and_ticked(arguments)))
   ]
   SubcommandOverridesAndArguments {

src/dependency.rs

@@ -15,7 +15,7 @@ impl<'src> Display for Dependency<'src> {
       write!(f, "({}", self.recipe.name())?;
 
       for argument in &self.arguments {
-        write!(f, " {}", argument)?;
+        write!(f, " {argument}")?;
       }
 
       write!(f, ")")

src/error.rs

@@ -256,10 +256,10 @@ impl<'src> ColorDisplay for Error<'src> {
       }
       Backtick { output_error, .. } => match output_error {
         OutputError::Code(code) => {
-          write!(f, "Backtick failed with exit code {}", code)?;
+          write!(f, "Backtick failed with exit code {code}")?;
         }
         OutputError::Signal(signal) => {
-          write!(f, "Backtick was terminated by signal {}", signal)?;
+          write!(f, "Backtick was terminated by signal {signal}")?;
         }
         OutputError::Unknown => {
           write!(f, "Backtick failed for an unknown reason")?;
@@ -343,7 +343,7 @@ impl<'src> ColorDisplay for Error<'src> {
             recipe, n, code
           )?;
         } else {
-          write!(f, "Recipe `{}` failed with exit code {}", recipe, code)?;
+          write!(f, "Recipe `{recipe}` failed with exit code {code}")?;
         }
       }
       CommandInvoke {
@@ -422,7 +422,7 @@ impl<'src> ColorDisplay for Error<'src> {
                path:\n{}",
               recipe, io_error
             ),
-            _ => write!(f, "Could not run `cygpath` executable:\n{}", io_error),
+            _ => write!(f, "Could not run `cygpath` executable:\n{io_error}"),
           }?;
         }
         OutputError::Utf8(utf8_error) => {
@@ -447,34 +447,28 @@ impl<'src> ColorDisplay for Error<'src> {
         )?;
       }
       Dotenv { dotenv_error } => {
-        write!(f, "Failed to load environment file: {}", dotenv_error)?;
+        write!(f, "Failed to load environment file: {dotenv_error}")?;
       }
       DumpJson { serde_json_error } => {
-        write!(f, "Failed to dump JSON to stdout: {}", serde_json_error)?;
+        write!(f, "Failed to dump JSON to stdout: {serde_json_error}")?;
       }
       EditorInvoke { editor, io_error } => {
         write!(
           f,
-          "Editor `{}` invocation failed: {}",
+          "Editor `{}` invocation failed: {io_error}",
           editor.to_string_lossy(),
-          io_error
         )?;
       }
       EditorStatus { editor, status } => {
-        write!(
-          f,
-          "Editor `{}` failed: {}",
-          editor.to_string_lossy(),
-          status
-        )?;
+        write!(f, "Editor `{}` failed: {status}", editor.to_string_lossy(),)?;
       }
       EvalUnknownVariable {
         variable,
         suggestion,
       } => {
-        write!(f, "Justfile does not contain variable `{}`.", variable,)?;
+        write!(f, "Justfile does not contain variable `{variable}`.")?;
         if let Some(suggestion) = *suggestion {
-          write!(f, "\n{}", suggestion)?;
+          write!(f, "\n{suggestion}")?;
         }
       }
       FormatCheckFoundDiff => {
@@ -533,7 +527,7 @@ impl<'src> ColorDisplay for Error<'src> {
         write!(f, "Justfile contains no recipes.")?;
       }
       RegexCompile { source } => {
-        write!(f, "{}", source)?;
+        write!(f, "{source}")?;
       }
       Search { search_error } => Display::fmt(search_error, f)?,
       Shebang {
@@ -545,14 +539,12 @@ impl<'src> ColorDisplay for Error<'src> {
         if let Some(argument) = argument {
           write!(
             f,
-            "Recipe `{}` with shebang `#!{} {}` execution error: {}",
-            recipe, command, argument, io_error
+            "Recipe `{recipe}` with shebang `#!{command} {argument}` execution error: {io_error}",
           )?;
         } else {
           write!(
             f,
-            "Recipe `{}` with shebang `#!{}` execution error: {}",
-            recipe, command, io_error
+            "Recipe `{recipe}` with shebang `#!{command}` execution error: {io_error}",
           )?;
         }
       }
@@ -564,18 +556,16 @@ impl<'src> ColorDisplay for Error<'src> {
         if let Some(n) = line_number {
           write!(
             f,
-            "Recipe `{}` was terminated on line {} by signal {}",
-            recipe, n, signal
+            "Recipe `{recipe}` was terminated on line {n} by signal {signal}",
           )?;
         } else {
-          write!(f, "Recipe `{}` was terminated by signal {}", recipe, signal)?;
+          write!(f, "Recipe `{recipe}` was terminated by signal {signal}")?;
         }
       }
       TmpdirIo { recipe, io_error } => write!(
         f,
-        "Recipe `{}` could not be run because of an IO error while trying to create a temporary \
-         directory or write a file to that directory`:{}",
-        recipe, io_error
+        "Recipe `{recipe}` could not be run because of an IO error while trying to create a temporary \
+         directory or write a file to that directory`:{io_error}",
       )?,
       Unknown {
         recipe,
@@ -584,11 +574,10 @@ impl<'src> ColorDisplay for Error<'src> {
         if let Some(n) = line_number {
           write!(
             f,
-            "Recipe `{}` failed on line {} for an unknown reason",
-            recipe, n
+            "Recipe `{recipe}` failed on line {n} for an unknown reason",
           )?;
         } else {
-          write!(f, "Recipe `{}` failed for an unknown reason", recipe)?;
+          write!(f, "Recipe `{recipe}` failed for an unknown reason")?;
         }
       }
       UnknownOverrides { overrides } => {
@@ -610,7 +599,7 @@ impl<'src> ColorDisplay for Error<'src> {
           List::or_ticked(recipes),
         )?;
         if let Some(suggestion) = *suggestion {
-          write!(f, "\n{}", suggestion)?;
+          write!(f, "\n{suggestion}")?;
         }
       }
       Unstable { message } => {