Update to rust 2021 and small clippy cleanups (#55)

dylanowen · Jan 31, 2023 · 5c2daca · 5c2daca
1 parent fd0e754
commit 5c2daca
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,4 +63,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: -- -D warnings
+          args: --all-targets --all-features -- -D warnings
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ readme = "Readme.md"
 license = "MPL-2.0"
 homepage = "https://github.com/dylanowen/mdbook-graphviz"
 repository = "https://github.com/dylanowen/mdbook-graphviz"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/Makefile b/Makefile
@@ -3,13 +3,14 @@ SHELL:=/bin/bash
 .DEFAULT_GOAL := default
 
 fix:
-	cargo fix --allow-staged
+	cargo fix --all-targets --all-features --allow-staged
+	cargo clippy --fix --all-targets --all-features --allow-staged
 
 fmt:
 	cargo fmt --all -- --check
 
 lint:
-	cargo clippy -- -D warnings
+	cargo clippy --all-targets --all-features -- -D warnings
 	-cargo audit
 
 check:

diff --git a/src/main.rs b/src/main.rs
@@ -31,7 +31,7 @@ fn main() {
     if let Some(sub_args) = matches.subcommand_matches("supports") {
         handle_supports(&preprocessor, sub_args);
     } else if let Err(e) = handle_preprocessing(&preprocessor) {
-        eprintln!("{}", e);
+        eprintln!("{e}");
         process::exit(1);
     }
 }

diff --git a/src/preprocessor.rs b/src/preprocessor.rs
@@ -255,7 +255,7 @@ impl GraphvizBlock {
             )
         };
 
-        format!("{}.svg", image_name)
+        format!("{image_name}.svg")
     }
 
     pub fn output_path(&self) -> PathBuf {
@@ -301,7 +301,7 @@ mod test {
             } = block;
 
             Ok(vec![Event::Text(
-                format!("{}|{:?}|{}|{}", file_name, output_path, graph_name, index).into(),
+                format!("{file_name}|{output_path:?}|{graph_name}|{index}").into(),
             )])
         }
     }
@@ -335,8 +335,7 @@ digraph Test {
         let expected = format!(
             r#"# Chapter
 
-{}_0.generated.svg|"/./book/{}_0.generated.svg"||0"#,
-            NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_0.generated.svg"||0"#
         );
 
         let chapter = process_chapter(chapter).await.unwrap();
@@ -359,8 +358,7 @@ digraph Test {
         let expected = format!(
             r#"# Chapter
 
-{}_graph_name_0.generated.svg|"/./book/{}_graph_name_0.generated.svg"|Graph Name|0"#,
-            NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg"|Graph Name|0"#
         );
 
         let chapter = process_chapter(chapter).await.unwrap();
@@ -392,8 +390,7 @@ digraph Test {
 /*asteriks/*
 ( \int x dx = \frac{{x^2}}{{2}} + C)
 
-{}_graph_name_0.generated.svg|"/./book/{}_graph_name_0.generated.svg"|Graph Name|0"#,
-            NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg"|Graph Name|0"#
         );
 
         let chapter = process_chapter(chapter).await.unwrap();
@@ -429,8 +426,7 @@ digraph Test {
 |col 2 is|centered|$12|
 |col 3 is|right-aligned|$1|
 
-{}_graph_name_0.generated.svg|"/./book/{}_graph_name_0.generated.svg"|Graph Name|0"#,
-            NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg"|Graph Name|0"#
         );
 
         let chapter = process_chapter(chapter).await.unwrap();
@@ -483,9 +479,7 @@ digraph Test {
 
         assert!(
             duration < SLEEP_DURATION * 2,
-            "{:?} should be less than 2 * {:?} since we expect some variation when running",
-            duration,
-            SLEEP_DURATION
+            "{duration:?} should be less than 2 * {SLEEP_DURATION:?} since we expect some variation when running"
         );
     }
 
@@ -508,8 +502,7 @@ digraph Test {
         let expected = format!(
             r#"# Chapter
 
-{}_graph_name_0.generated.svg|"/./book/{}_graph_name_0.generated.svg"|Graph Name|0"#,
-            NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg"|Graph Name|0"#
         );
 
         let mut chapter = process_chapter(chapter).await.unwrap();
@@ -548,8 +541,7 @@ digraph Test {
                 BookItem::Chapter(new_chapter(format!(
                     r#"# Chapter
 
-{}_graph_name_0.generated.svg|"/./book/{}_graph_name_0.generated.svg"|Graph Name|0"#,
-                    NORMALIZED_CHAPTER_NAME, NORMALIZED_CHAPTER_NAME
+{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg|"/./book/{NORMALIZED_CHAPTER_NAME}_graph_name_0.generated.svg"|Graph Name|0"#
                 )))
             ]
         )

diff --git a/src/renderer.rs b/src/renderer.rs
@@ -102,7 +102,7 @@ fn format_output(output: String) -> String {
     let output = NEW_LINE_TAGS_RE.replace_all(&output, "><");
     let output = output.trim();
 
-    format!("<div>{}</div>", output)
+    format!("<div>{output}</div>")
 }
 
 #[cfg(test)]