FIX: Fix clippy manual_unwrap_or_default

badumbatish · badumbatish · commit a096ff7c22c7 · 2024-09-09T15:48:23.000-07:00
diff --git a/cargo-miri/src/util.rs b/cargo-miri/src/util.rs
@@ -105,10 +105,8 @@ pub fn get_miriflags() -> Vec<String> {
     if let Ok(a) = env::var("MIRIFLAGS") {
         // This code is taken from `RUSTFLAGS` handling in cargo.
         a.split(' ').map(str::trim).filter(|s| !s.is_empty()).map(str::to_string).collect()
-    } else if let Ok(args) = serde_json::from_str::<Vec<String>>(config_miriflags) {
-        args
     } else {
-        Vec::default()
+        serde_json::from_str::<Vec<String>>(config_miriflags).unwrap_or_default()
     }
 }
 /// Returns the path to the `miri` binary

Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,8 @@ pub fn get_miriflags() -> Vec<String> {`
`105`	`105`	`if let Ok(a) = env::var("MIRIFLAGS") {`
`106`	`106`	// This code is taken from `RUSTFLAGS` handling in cargo.
`107`	`107`	`a.split(' ').map(str::trim).filter(\|s\| !s.is_empty()).map(str::to_string).collect()`
`108`		`- } else if let Ok(args) = serde_json::from_str::<Vec<String>>(config_miriflags) {`
`109`		`- args`
`110`	`108`	`} else {`
`111`		`- Vec::default()`
	`109`	`+ serde_json::from_str::<Vec<String>>(config_miriflags).unwrap_or_default()`
`112`	`110`	`}`
`113`	`111`	`}`
`114`	`112`	/// Returns the path to the `miri` binary