Skip to content

core::option: obey idiom of leaving behind a trailing comma in match blocks #26974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/libcore/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
//! // The division was valid
//! Some(x) => println!("Result: {}", x),
//! // The division was invalid
//! None => println!("Cannot divide by 0")
//! None => println!("Cannot divide by 0"),
//! }
//! ```
//!
Expand Down Expand Up @@ -75,7 +75,7 @@
//! fn check_optional(optional: &Option<Box<i32>>) {
//! match *optional {
//! Some(ref p) => println!("have value {}", p),
//! None => println!("have no value")
//! None => println!("have no value"),
//! }
//! }
//! ```
Expand All @@ -95,13 +95,13 @@
//! // Take a reference to the contained string
//! match msg {
//! Some(ref m) => println!("{}", *m),
//! None => ()
//! None => (),
//! }
//!
//! // Remove the contained string, destroying the Option
//! let unwrapped_msg = match msg {
//! Some(m) => m,
//! None => "default message"
//! None => "default message",
//! };
//! ```
//!
Expand Down Expand Up @@ -137,7 +137,7 @@
//!
//! match name_of_biggest_animal {
//! Some(name) => println!("the biggest animal is {}", name),
//! None => println!("there are no animals :(")
//! None => println!("there are no animals :("),
//! }
//! ```

Expand Down Expand Up @@ -198,7 +198,7 @@ impl<T> Option<T> {
pub fn is_some(&self) -> bool {
match *self {
Some(_) => true,
None => false
None => false,
}
}

Expand Down Expand Up @@ -244,7 +244,7 @@ impl<T> Option<T> {
pub fn as_ref<'r>(&'r self) -> Option<&'r T> {
match *self {
Some(ref x) => Some(x),
None => None
None => None,
}
}

Expand All @@ -265,7 +265,7 @@ impl<T> Option<T> {
pub fn as_mut<'r>(&'r mut self) -> Option<&'r mut T> {
match *self {
Some(ref mut x) => Some(x),
None => None
None => None,
}
}

Expand Down Expand Up @@ -376,7 +376,7 @@ impl<T> Option<T> {
pub fn unwrap_or(self, def: T) -> T {
match self {
Some(x) => x,
None => def
None => def,
}
}

Expand All @@ -394,7 +394,7 @@ impl<T> Option<T> {
pub fn unwrap_or_else<F: FnOnce() -> T>(self, f: F) -> T {
match self {
Some(x) => x,
None => f()
None => f(),
}
}

Expand All @@ -420,7 +420,7 @@ impl<T> Option<T> {
pub fn map<U, F: FnOnce(T) -> U>(self, f: F) -> Option<U> {
match self {
Some(x) => Some(f(x)),
None => None
None => None,
}
}

Expand Down Expand Up @@ -464,7 +464,7 @@ impl<T> Option<T> {
pub fn map_or_else<U, D: FnOnce() -> U, F: FnOnce(T) -> U>(self, default: D, f: F) -> U {
match self {
Some(t) => f(t),
None => default()
None => default(),
}
}

Expand Down Expand Up @@ -637,7 +637,7 @@ impl<T> Option<T> {
pub fn or(self, optb: Option<T>) -> Option<T> {
match self {
Some(_) => self,
None => optb
None => optb,
}
}

Expand All @@ -659,7 +659,7 @@ impl<T> Option<T> {
pub fn or_else<F: FnOnce() -> Option<T>>(self, f: F) -> Option<T> {
match self {
Some(_) => self,
None => f()
None => f(),
}
}

Expand Down Expand Up @@ -736,7 +736,7 @@ impl<T: Default> Option<T> {
pub fn unwrap_or_default(self) -> T {
match self {
Some(x) => x,
None => Default::default()
None => Default::default(),
}
}
}
Expand Down