extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-14 07:58:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Match cleanup (#2294)

Browse Source 
* Delete unnecessary match

* Use `unwrap_or_else()`

* Whitespace was trim on file save

* Use `map_or_else()`

* Use a default to group all match arms with same output

* Clippy made me do it
This commit is contained in:
Joseph T. Lyons
2020-08-03 13:43:27 -04:00
committed by GitHub
parent 3a7869b422
commit eeb9b4edcb
5 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/nu-source/src/meta.rs
View File

@ -465,10 +465,7 @@ impl From<&Span> for Span {
impl From<Option<Span>> for Span {
fn from(input: Option<Span>) -> Span {
match input {
None => Span::new(0, 0),
Some(span) => span,
}
input.unwrap_or_else(|| Span::new(0, 0))
}
}
@ -635,9 +632,9 @@ impl Span {
/// // make clean
/// // ----
/// // (0,4)
/// //
/// //
/// // ^(5,5)
///
///
/// let make_span = Span::new(0,4);
/// let clean_span = Span::new(5,5);
///

5
crates/nu-source/src/pretty.rs
View File

@ -249,10 +249,7 @@ impl DebugDocBuilder {
}
pub fn option(builder: Option<DebugDocBuilder>) -> DebugDocBuilder {
match builder {
None => DebugDocBuilder::blank(),
Some(b) => b,
}
builder.unwrap_or_else(DebugDocBuilder::blank)
}
pub fn space() -> DebugDocBuilder {