style: Make clippy happy

crate-ci · May 19, 2023 · d345ce3 · d345ce3
1 parent ab38975
commit d345ce3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/examples/example_fixture.rs b/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);
 }

diff --git a/src/bin/bin_fixture.rs b/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);
 }

diff --git a/src/format/mod.rs b/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),

diff --git a/tests/build.rs b/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())

diff --git a/tests/run.rs b/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())