diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-07 14:52:28 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-07 18:10:11 -0700 |
| commit | 3bd1f32cd945fab63777b71ef76f23d758e2904c (patch) | |
| tree | 8035a0aa8bf9fa926484604074427146ec295b1d /src/libcore/option.rs | |
| parent | 07fe5611ade0e02109a5fa72881c6cd43bacbb29 (diff) | |
| download | rust-3bd1f32cd945fab63777b71ef76f23d758e2904c.tar.gz rust-3bd1f32cd945fab63777b71ef76f23d758e2904c.zip | |
Convert all kind bounds to camel case. Remove send, owned keywords.
Diffstat (limited to 'src/libcore/option.rs')
| -rw-r--r-- | src/libcore/option.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 5b7aee4d74c..980f1899566 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -16,7 +16,7 @@ enum Option<T> { Some(T), } -pure fn get<T: copy>(opt: Option<T>) -> T { +pure fn get<T: Copy>(opt: Option<T>) -> T { /*! * Gets the value out of an option * @@ -45,7 +45,7 @@ pure fn get_ref<T>(opt: &r/Option<T>) -> &r/T { } } -pure fn expect<T: copy>(opt: Option<T>, reason: ~str) -> T { +pure fn expect<T: Copy>(opt: Option<T>, reason: ~str) -> T { /*! * Gets the value out of an option, printing a specified message on * failure @@ -128,7 +128,7 @@ pure fn is_some<T>(opt: Option<T>) -> bool { !is_none(opt) } -pure fn get_default<T: copy>(opt: Option<T>, def: T) -> T { +pure fn get_default<T: Copy>(opt: Option<T>, def: T) -> T { //! Returns the contained value or a default match opt { Some(x) => x, None => def } @@ -226,7 +226,7 @@ impl<T> &Option<T> { pure fn get_ref() -> &self/T { get_ref(self) } } -impl<T: copy> Option<T> { +impl<T: Copy> Option<T> { /** * Gets the value out of an option * |
