MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-19 12:24:17 +00:00
Code Issues Releases Wiki Activity

Use map instead of and_then(..Some(..))

Browse Source
This commit is contained in:
sharkdp 2018-07-23 21:19:47 +02:00 committed by David Peter
parent bf53b64125
commit c899849101
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.rs
View File

@ -286,7 +286,7 @@ impl App {
theme: self theme: self
.matches .matches
.value_of("theme") .value_of("theme")
.and_then(|theme_name_arg| Some(String::from(theme_name_arg))) .map(String::from)
.or_else(|| { .or_else(|| {
env::var("BAT_THEME").ok().and_then(|theme_name_env| { env::var("BAT_THEME").ok().and_then(|theme_name_env| {
if HighlightingAssets::new().theme_exists(&theme_name_env) { if HighlightingAssets::new().theme_exists(&theme_name_env) {