Merge pull request #66 from epage/template

chore: Update from '_rust/main' template

.clippy.toml

@@ -3,10 +3,11 @@ warn-on-all-wildcard-imports = true
 allow-expect-in-tests = true
 allow-unwrap-in-tests = true
 allow-dbg-in-tests = true
-allow-print-in-tests = true
 disallowed-methods = [
-    { path = "std::option::Option::map_or", reason = "use `map(..).unwrap_or(..)`" },
-    { path = "std::option::Option::map_or_else", reason = "use `map(..).unwrap_or_else(..)`" },
-    { path = "std::result::Result::map_or", reason = "use `map(..).unwrap_or(..)`" },
-    { path = "std::result::Result::map_or_else", reason = "use `map(..).unwrap_or_else(..)`" },
+    { path = "std::option::Option::map_or", reason = "prefer `map(..).unwrap_or(..)` for legibility" },
+    { path = "std::option::Option::map_or_else", reason = "prefer `map(..).unwrap_or_else(..)` for legibility" },
+    { path = "std::result::Result::map_or", reason = "prefer `map(..).unwrap_or(..)` for legibility" },
+    { path = "std::result::Result::map_or_else", reason = "prefer `map(..).unwrap_or_else(..)` for legibility" },
+    { path = "std::iter::Iterator::for_each", reason = "prefer `for` for side-effects" },
+    { path = "std::iter::Iterator::try_for_each", reason = "prefer `for` for side-effects" },
 ]

.github/settings.yml

@@ -10,9 +10,12 @@ repository:
   has_downloads: true
   default_branch: master
 
-  allow_squash_merge: true
+  # Preference: people do clean commits
   allow_merge_commit: true
-  allow_rebase_merge: true
+  # Backup in case we need to clean up commits
+  allow_squash_merge: true
+  # Not really needed
+  allow_rebase_merge: false
 
   allow_auto_merge: true
   delete_branch_on_merge: true

.github/workflows/ci.yml

@@ -126,3 +126,5 @@ jobs:
       with:
         sarif_file: clippy-results.sarif
         wait-for-processing: true
+    - name: Report status
+      run: cargo clippy --workspace --all-features --all-targets -- -D warnings --allow deprecated

examples/example_fixture.rs

@@ -15,7 +15,8 @@ fn run() -> Result<(), Box<dyn Error>> {
     let code = env::var("exit")
         .ok()
         .map(|v| v.parse::<i32>())
-        .map_or(Ok(None), |r| r.map(Some))?
+        .map(|r| r.map(Some))
+        .unwrap_or(Ok(None))?
         .unwrap_or(0);
     process::exit(code);
 }

src/bin/bin_fixture.rs

@@ -15,7 +15,8 @@ fn run() -> Result<(), Box<dyn Error>> {
     let code = env::var("exit")
         .ok()
         .map(|v| v.parse::<i32>())
-        .map_or(Ok(None), |r| r.map(Some))?
+        .map(|r| r.map(Some))
+        .unwrap_or(Ok(None))?
         .unwrap_or(0);
     process::exit(code);
 }

src/format/mod.rs

@@ -14,6 +14,7 @@ type CowStr<'a> = borrow::Cow<'a, str>;
 /// A cargo message
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(tag = "reason", rename_all = "kebab-case")]
+#[allow(clippy::large_enum_variant)]
 pub enum Message<'a> {
     /// Build completed, all further output should not be parsed
     BuildFinished(BuildFinished),

tests/build.rs

@@ -2,7 +2,7 @@ fn test_fixture(name: &str) {
     let temp = assert_fs::TempDir::new().unwrap();
 
     let msgs = escargot::CargoBuild::new()
-        .manifest_path(&format!("tests/fixtures/{}/Cargo.toml", name))
+        .manifest_path(format!("tests/fixtures/{}/Cargo.toml", name))
         .current_release()
         .current_target()
         .target_dir(temp.path())

tests/run.rs

@@ -2,7 +2,7 @@ fn test_fixture(name: &str) {
     let temp = assert_fs::TempDir::new().unwrap();
 
     let cmd = escargot::CargoBuild::new()
-        .manifest_path(&format!("tests/fixtures/{}/Cargo.toml", name))
+        .manifest_path(format!("tests/fixtures/{}/Cargo.toml", name))
         .current_release()
         .current_target()
         .target_dir(temp.path())