Improve readability

jannic · jannic · commit 518d0df96e48 · 2024-04-03T21:10:58.000Z
diff --git a/src/patch/mod.rs b/src/patch/mod.rs
@@ -804,8 +804,11 @@ impl Spec for str {
 }
 
 fn opt_interpolate<T: Interpolate>(path: &Option<&T>, s: Option<&str>) -> Option<String> {
-    path.and_then(|path| path.interpolate_opt(s))
-        .or_else(|| s.map(ToString::to_string))
+    if let Some(path) = path {
+        path.interpolate_opt(s)
+    } else {
+        s.map(ToString::to_string)
+    }
 }
 
 trait Interpolate {

Original file line number	Diff line number	Diff line change
`@@ -804,8 +804,11 @@ impl Spec for str {`
`804`	`804`	`}`
`805`	`805`
`806`	`806`	`fn opt_interpolate<T: Interpolate>(path: &Option<&T>, s: Option<&str>) -> Option<String> {`
`807`		`- path.and_then(\|path\| path.interpolate_opt(s))`
`808`		`- .or_else(\|\| s.map(ToString::to_string))`
	`807`	`+ if let Some(path) = path {`
	`808`	`+ path.interpolate_opt(s)`
	`809`	`+ } else {`
	`810`	`+ s.map(ToString::to_string)`
	`811`	`+ }`
`809`	`812`	`}`
`810`	`813`
`811`	`814`	`trait Interpolate {`