mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #18927 : areski/rust/pr-improve-option-match-readl, r=jakub-

Browse Source 
**match** are much more easy to read when it's not in 1 single line
This commit is contained in:
bors 2014-11-17 02:56:55 +00:00
commit 803aacd5ae
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcore/option.rs
View File

@ -235,7 +235,10 @@ pub fn is_none(&self) -> bool {
#[inline]
#[stable]
pub fn as_ref<'r>(&'r self) -> Option<&'r T> {
match *self { Some(ref x) => Some(x), None => None }
match *self {
Some(ref x) => Some(x),
None => None
}
}
/// Convert from `Option<T>` to `Option<&mut T>`
@ -253,7 +256,10 @@ pub fn as_ref<'r>(&'r self) -> Option<&'r T> {
#[inline]
#[unstable = "waiting for mut conventions"]
pub fn as_mut<'r>(&'r mut self) -> Option<&'r mut T> {
match *self { Some(ref mut x) => Some(x), None => None }
match *self {
Some(ref mut x) => Some(x),
None => None
}
}
/// Convert from `Option<T>` to `&mut [T]` (without copying)
@ -401,7 +407,10 @@ pub fn unwrap_or_else(self, f: || -> T) -> T {
#[inline]
#[unstable = "waiting for unboxed closures"]
pub fn map<U>(self, f: |T| -> U) -> Option<U> {
match self { Some(x) => Some(f(x)), None => None }
match self {
Some(x) => Some(f(x)),
None => None
}
}
/// Applies a function to the contained value or returns a default.
@ -418,7 +427,10 @@ pub fn map<U>(self, f: |T| -> U) -> Option<U> {
#[inline]
#[unstable = "waiting for unboxed closures"]
pub fn map_or<U>(self, def: U, f: |T| -> U) -> U {
match self { None => def, Some(t) => f(t) }
match self {
Some(t) => f(t),
None => def
}
}
/// Applies a function to the contained value or computes a default.
@ -437,7 +449,10 @@ pub fn map_or<U>(self, def: U, f: |T| -> U) -> U {
#[inline]
#[unstable = "waiting for unboxed closures"]
pub fn map_or_else<U>(self, def: || -> U, f: |T| -> U) -> U {
match self { None => def(), Some(t) => f(t) }
match self {
Some(t) => f(t),
None => def()
}
}
/// Transforms the `Option<T>` into a `Result<T, E>`, mapping `Some(v)` to