extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-19 13:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Match cleanup (#2184)

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

* Use `?` for error propogation, and remove `match`
This commit is contained in:
Joseph T. Lyons
2020-07-15 03:51:41 -04:00
committed by GitHub
parent c299d207f7
commit 7c0a830d84
13 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-cli/src/commands/str_/capitalize.rs
View File

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

5
crates/nu-cli/src/commands/str_/downcase.rs
View File

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

5
crates/nu-cli/src/commands/str_/find_replace.rs
View File

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

5
crates/nu-cli/src/commands/str_/from.rs
View File

@@ -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) {
Ok(out) => ReturnSuccess::value(out),
Err(err) => Err(err),
}
ReturnSuccess::value(action(&v, v.tag(), digits, group_digits)?)
} else {
let mut ret = v;
for path in &column_paths {

5
crates/nu-cli/src/commands/str_/set.rs
View File

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

5
crates/nu-cli/src/commands/str_/substring.rs
View File

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

5
crates/nu-cli/src/commands/str_/to_datetime.rs
View File

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

5
crates/nu-cli/src/commands/str_/to_decimal.rs
View File

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

5
crates/nu-cli/src/commands/str_/to_integer.rs
View File

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

5
crates/nu-cli/src/commands/str_/trim.rs
View File

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

5
crates/nu-cli/src/commands/str_/upcase.rs
View File

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