bin: replace .unwrap_or with .map_or

otavio · otavio · commit 6d7fef078ea0 · 2018-10-12T20:22:10.000-03:00
Signed-off-by: Otavio Salvador &lt;otavio@ossystems.com.br&gt;
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -156,9 +156,7 @@ fn make_opts() -> Options {
 }
 
 fn is_nightly() -> bool {
-    option_env!("CFG_RELEASE_CHANNEL")
-        .map(|c| c == "nightly" || c == "dev")
-        .unwrap_or(false)
+    option_env!("CFG_RELEASE_CHANNEL").map_or(false, |c| c == "nightly" || c == "dev")
 }
 
 // Returned i32 is an exit code

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,7 @@ fn make_opts() -> Options {`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`fn is_nightly() -> bool {`
`159`		`- option_env!("CFG_RELEASE_CHANNEL")`
`160`		`- .map(\|c\| c == "nightly" \|\| c == "dev")`
`161`		`- .unwrap_or(false)`
	`159`	`+ option_env!("CFG_RELEASE_CHANNEL").map_or(false, \|c\| c == "nightly" \|\| c == "dev")`
`162`	`160`	`}`
`163`	`161`
`164`	`162`	`// Returned i32 is an exit code`