diff --git a/src/lib.rs b/src/lib.rs index c4b6431..d18bdd8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -352,7 +352,7 @@ fn handle_entries( )?; handle_entries(&mut modrs, &path, &outdir)?; write_if_changed(&outdir.join("mod.rs"), &modrs)?; - writeln!(f, "pub mod {name};\n", name = filename)?; + writeln!(f, "pub mod {filename};\n")?; } } else if let Some(filename) = entry.file_name().to_str() { for suffix in &[".rs.html", ".rs.svg", ".rs.xml"] { @@ -368,7 +368,6 @@ fn handle_entries( mod template_{name};\n\ #[doc(inline)]\n\ pub use self::template_{name}::{name};\n", - name = name, )?; } } @@ -391,13 +390,13 @@ fn handle_template( let mut data = Vec::new(); t.write_rust(&mut data, name)?; write_if_changed( - &outdir.join(format!("template_{}.rs", name)), + &outdir.join(format!("template_{name}.rs")), &data, )?; Ok(true) } Err(error) => { - println!("cargo:warning=Template parse error in {:?}:", path); + println!("cargo:warning=Template parse error in {path:?}:"); show_errors(&mut io::stdout(), &buf, &error, "cargo:warning="); Ok(false) } @@ -434,14 +433,14 @@ impl Error for RucteError { impl Display for RucteError { fn fmt(&self, out: &mut fmt::Formatter) -> fmt::Result { - write!(out, "Error: {:?}", self) + write!(out, "Error: {self:?}") } } impl Debug for RucteError { fn fmt(&self, out: &mut fmt::Formatter) -> fmt::Result { match self { RucteError::Io(err) => Display::fmt(err, out), - RucteError::Env(var, err) => write!(out, "{:?}: {}", var, err), + RucteError::Env(var, err) => write!(out, "{var:?}: {err}"), #[cfg(feature = "sass")] RucteError::Sass(err) => Debug::fmt(err, out), } diff --git a/src/parseresult.rs b/src/parseresult.rs index fbdcfb3..cd358f9 100644 --- a/src/parseresult.rs +++ b/src/parseresult.rs @@ -23,7 +23,7 @@ pub fn show_errors( } } Err::Incomplete(needed) => { - let msg = format!("Incomplete: {:?}", needed); + let msg = format!("Incomplete: {needed:?}"); show_error(out, buf, 0, &msg, prefix); } } @@ -32,7 +32,7 @@ pub fn show_errors( fn get_message(err: &VerboseErrorKind) -> Option { match err { VerboseErrorKind::Context(msg) => Some((*msg).into()), - VerboseErrorKind::Char(ch) => Some(format!("Expected {:?}", ch)), + VerboseErrorKind::Char(ch) => Some(format!("Expected {ch:?}")), VerboseErrorKind::Nom(_err) => None, } } diff --git a/src/staticfiles.rs b/src/staticfiles.rs index 9de2043..4aba508 100644 --- a/src/staticfiles.rs +++ b/src/staticfiles.rs @@ -350,7 +350,7 @@ impl StaticFile { let mut input = File::open(&path)?; let mut buf = Vec::new(); input.read_to_end(&mut buf)?; - let rust_name = format!("{}_{}", name, ext); + let rust_name = format!("{name}_{ext}"); let url_name = format!("{}-{}.{}", name, checksum_slug(&buf), &ext); self.add_static( @@ -429,7 +429,7 @@ impl StaticFile { { let path = &self.path_for(path); if let Some((name, ext)) = name_and_ext(path) { - let rust_name = format!("{}_{}", name, ext); + let rust_name = format!("{name}_{ext}"); let url_name = format!("{}-{}.{}", name, checksum_slug(data), &ext); self.add_static( diff --git a/src/template.rs b/src/template.rs index f0d60e2..f3d2b59 100644 --- a/src/template.rs +++ b/src/template.rs @@ -36,7 +36,7 @@ impl Template { use super::{Html,ToHtml};\n", )?; for l in &self.preamble { - writeln!(out, "{};", l)?; + writeln!(out, "{l};")?; } writeln!( out, diff --git a/src/templateexpression.rs b/src/templateexpression.rs index aef39b0..0585c74 100644 --- a/src/templateexpression.rs +++ b/src/templateexpression.rs @@ -76,13 +76,13 @@ impl TemplateExpression { match *self { TemplateExpression::Comment => String::new(), TemplateExpression::Text { ref text } if text.is_ascii() => { - format!("_ructe_out_.write_all(b{:?})?;\n", text) + format!("_ructe_out_.write_all(b{text:?})?;\n") } TemplateExpression::Text { ref text } => { - format!("_ructe_out_.write_all({:?}.as_bytes())?;\n", text) + format!("_ructe_out_.write_all({text:?}.as_bytes())?;\n") } TemplateExpression::Expression { ref expr } => { - format!("{}.to_html(_ructe_out_)?;\n", expr) + format!("{expr}.to_html(_ructe_out_)?;\n") } TemplateExpression::ForLoop { ref name, @@ -129,8 +129,7 @@ impl TemplateExpression { "{}(_ructe_out_{})?;\n", name, args.iter().format_with("", |arg, f| f(&format_args!( - ", {}", - arg + ", {arg}" ))), ) } @@ -234,7 +233,7 @@ pub fn template_expression(input: &[u8]) -> PResult { (i, Some(b"(")) => { map(terminated(expr_inside_parens, tag(")")), |expr| { TemplateExpression::Expression { - expr: format!("({})", expr), + expr: format!("({expr})"), } })(i) } @@ -353,7 +352,7 @@ fn cond_expression(input: &[u8]) -> PResult { ), ), ), - |(lhs, rhs)| format!("let {} = {}", lhs, rhs), + |(lhs, rhs)| format!("let {lhs} = {rhs}"), )(i), (_i, Some(_)) => unreachable!(), (i, None) => map( diff --git a/src/templates/utils.rs b/src/templates/utils.rs index 1b39130..15e741d 100644 --- a/src/templates/utils.rs +++ b/src/templates/utils.rs @@ -87,7 +87,7 @@ impl ToHtml for Html { impl ToHtml for T { #[inline] fn to_html(&self, out: &mut dyn Write) -> io::Result<()> { - write!(ToHtmlEscapingWriter(out), "{}", self) + write!(ToHtmlEscapingWriter(out), "{self}") } }