rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename option::get_or_default to get_default, for consistency

Browse Source
This commit is contained in:
Tim Chevalier
2012-04-11 09:24:46 -07:00
parent 9280d0c090
commit 1c39fda0ea
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/option.rs
View File

@@ -52,7 +52,7 @@ pure fn is_some<T>(opt: option<T>) -> bool {
!is_none(opt)
}
pure fn get_or_default<T: copy>(opt: option<T>, def: T) -> T {
pure fn get_default<T: copy>(opt: option<T>, def: T) -> T {
#[doc = "Returns the contained value or a default"];
alt opt { some(x) { x } none { def } }
@@ -94,7 +94,7 @@ impl extensions<T:copy> for option<T> {
"]
fn chain<U>(f: fn(T) -> option<U>) -> option<U> { chain(self, f) }
#[doc = "Returns the contained value or a default"]
fn get_or_default(def: T) -> T { get_or_default(self, def) }
fn get_default(def: T) -> T { get_default(self, def) }
#[doc = "Applies a function to the contained value or returns a default"]
fn map_default<U: copy>(def: U, f: fn(T) -> U) -> U
{ map_default(self, def, f) }