Match cleanup (#2184)

* Use `unwrap_or()` to remove `match`

* Use `?` for error propogation, and remove `match`

crates/nu-cli/src/cli.rs

@@ -149,10 +149,7 @@ pub fn load_plugins(context: &mut Context) -> Result<(), ShellError> {
             .map(|path| {
                 let bin_name = {
                     if let Some(name) = path.file_name() {
-                        match name.to_str() {
+                        name.to_str().unwrap_or("")
-                            Some(raw) => raw,
-                            None => "",
-                        }
                     } else {
                         ""
                     }

crates/nu-cli/src/commands/str_/capitalize.rs

@@ -62,10 +62,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag()) {
+                ReturnSuccess::value(action(&v, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/downcase.rs

@@ -62,10 +62,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag()) {
+                ReturnSuccess::value(action(&v, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/find_replace.rs

@@ -80,10 +80,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, &options, v.tag()) {
+                ReturnSuccess::value(action(&v, &options, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/from.rs

@@ -96,10 +96,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag(), digits, group_digits) {
+                ReturnSuccess::value(action(&v, v.tag(), digits, group_digits)?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
                 for path in &column_paths {

crates/nu-cli/src/commands/str_/set.rs

@@ -73,10 +73,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, &options, v.tag()) {
+                ReturnSuccess::value(action(&v, &options, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/substring.rs

@@ -108,10 +108,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, &options, v.tag()) {
+                ReturnSuccess::value(action(&v, &options, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/to_datetime.rs

@@ -81,10 +81,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, &options, v.tag()) {
+                ReturnSuccess::value(action(&v, &options, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/to_decimal.rs

@@ -65,10 +65,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag()) {
+                ReturnSuccess::value(action(&v, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/to_integer.rs

@@ -65,10 +65,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag()) {
+                ReturnSuccess::value(action(&v, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/trim.rs

@@ -79,10 +79,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag(), to_trim) {
+                ReturnSuccess::value(action(&v, v.tag(), to_trim)?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/commands/str_/upcase.rs

@@ -62,10 +62,7 @@ async fn operate(
     Ok(input
         .map(move |v| {
             if column_paths.is_empty() {
-                match action(&v, v.tag()) {
+                ReturnSuccess::value(action(&v, v.tag())?)
-                    Ok(out) => ReturnSuccess::value(out),
-                    Err(err) => Err(err),
-                }
             } else {
                 let mut ret = v;
 

crates/nu-cli/src/utils.rs

@@ -37,10 +37,7 @@ impl ValueStructure {
         }
 
         let path = if path.starts_with("/") {
-            match path.strip_prefix("/") {
+            path.strip_prefix("/").unwrap_or(path)
-                Ok(p) => p,
-                Err(_) => path,
-            }
         } else {
             path
         };