From 0f688d7da7481c78b54b280661930e0912e1b7b4 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Thu, 16 Jul 2020 13:39:51 -0400 Subject: [PATCH] Use '?' for error propagation, remove `match` (#2194) --- crates/nu-cli/src/commands/str_/capitalize.rs | 11 ++--------- crates/nu-cli/src/commands/str_/downcase.rs | 13 ++----------- crates/nu-cli/src/commands/str_/find_replace.rs | 13 ++----------- crates/nu-cli/src/commands/str_/from.rs | 12 ++---------- crates/nu-cli/src/commands/str_/set.rs | 13 ++----------- crates/nu-cli/src/commands/str_/substring.rs | 13 ++----------- crates/nu-cli/src/commands/str_/to_datetime.rs | 14 +++----------- crates/nu-cli/src/commands/str_/to_decimal.rs | 13 ++----------- crates/nu-cli/src/commands/str_/to_integer.rs | 13 ++----------- crates/nu-cli/src/commands/str_/trim.rs | 13 ++----------- crates/nu-cli/src/commands/str_/upcase.rs | 13 ++----------- 11 files changed, 23 insertions(+), 118 deletions(-) diff --git a/crates/nu-cli/src/commands/str_/capitalize.rs b/crates/nu-cli/src/commands/str_/capitalize.rs index 0e1f38172f..f487a5dec6 100644 --- a/crates/nu-cli/src/commands/str_/capitalize.rs +++ b/crates/nu-cli/src/commands/str_/capitalize.rs @@ -67,17 +67,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => return Err(err), - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/downcase.rs b/crates/nu-cli/src/commands/str_/downcase.rs index 3ac9694e4c..3955acce7f 100644 --- a/crates/nu-cli/src/commands/str_/downcase.rs +++ b/crates/nu-cli/src/commands/str_/downcase.rs @@ -67,19 +67,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/find_replace.rs b/crates/nu-cli/src/commands/str_/find_replace.rs index e6826d55db..7dd5cdf7c2 100644 --- a/crates/nu-cli/src/commands/str_/find_replace.rs +++ b/crates/nu-cli/src/commands/str_/find_replace.rs @@ -87,19 +87,10 @@ async fn operate( for path in &column_paths { let options = options.clone(); - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, &options, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/from.rs b/crates/nu-cli/src/commands/str_/from.rs index e0727f514e..67b605f726 100644 --- a/crates/nu-cli/src/commands/str_/from.rs +++ b/crates/nu-cli/src/commands/str_/from.rs @@ -100,18 +100,10 @@ async fn operate( } else { let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag(), digits, group_digits)), - ); - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/set.rs b/crates/nu-cli/src/commands/str_/set.rs index 0f74dbcc59..e45c78277e 100644 --- a/crates/nu-cli/src/commands/str_/set.rs +++ b/crates/nu-cli/src/commands/str_/set.rs @@ -80,19 +80,10 @@ async fn operate( for path in &column_paths { let options = options.clone(); - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, &options, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/substring.rs b/crates/nu-cli/src/commands/str_/substring.rs index f7823474db..d41b7ece6a 100644 --- a/crates/nu-cli/src/commands/str_/substring.rs +++ b/crates/nu-cli/src/commands/str_/substring.rs @@ -115,19 +115,10 @@ async fn operate( for path in &column_paths { let options = options.clone(); - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, &options, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/to_datetime.rs b/crates/nu-cli/src/commands/str_/to_datetime.rs index 938572e8d5..b4e9944593 100644 --- a/crates/nu-cli/src/commands/str_/to_datetime.rs +++ b/crates/nu-cli/src/commands/str_/to_datetime.rs @@ -87,19 +87,11 @@ async fn operate( for path in &column_paths { let options = options.clone(); - let swapping = ret.swap_data_by_column_path( + + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, &options, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/to_decimal.rs b/crates/nu-cli/src/commands/str_/to_decimal.rs index 74772a8324..ef63a444e7 100644 --- a/crates/nu-cli/src/commands/str_/to_decimal.rs +++ b/crates/nu-cli/src/commands/str_/to_decimal.rs @@ -70,19 +70,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/to_integer.rs b/crates/nu-cli/src/commands/str_/to_integer.rs index 0b24e1523c..6f8a887c37 100644 --- a/crates/nu-cli/src/commands/str_/to_integer.rs +++ b/crates/nu-cli/src/commands/str_/to_integer.rs @@ -70,19 +70,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/trim.rs b/crates/nu-cli/src/commands/str_/trim.rs index a2615e04aa..03e4883b08 100644 --- a/crates/nu-cli/src/commands/str_/trim.rs +++ b/crates/nu-cli/src/commands/str_/trim.rs @@ -84,19 +84,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag(), to_trim)), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret) diff --git a/crates/nu-cli/src/commands/str_/upcase.rs b/crates/nu-cli/src/commands/str_/upcase.rs index c3d40279f6..5b8e0160d8 100644 --- a/crates/nu-cli/src/commands/str_/upcase.rs +++ b/crates/nu-cli/src/commands/str_/upcase.rs @@ -67,19 +67,10 @@ async fn operate( let mut ret = v; for path in &column_paths { - let swapping = ret.swap_data_by_column_path( + ret = ret.swap_data_by_column_path( path, Box::new(move |old| action(old, old.tag())), - ); - - match swapping { - Ok(new_value) => { - ret = new_value; - } - Err(err) => { - return Err(err); - } - } + )?; } ReturnSuccess::value(ret)