nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Result::or : avoid over-specializing the type

Browse Source 
Changes .or() so that it can return a Result with a different E type
than the one it is called on.

Essentially:

    fn or(self, res: Result<T, E>) -> Result<T, E>

becomes

    fn or<F>(self, res: Result<T, F>) -> Result<T, F>

This brings `or` in line with the existing `and` and `or_else` member
types.

This is a
[breaking-change]
Due to some code needing additional type annotations.
This commit is contained in:
Cody P Schafer 2015-02-25 13:37:22 -05:00
parent 880fb89bde
commit 07dc8d67c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/result.rs
View File

@ -641,9 +641,9 @@ impl<T, E> Result<T, E> {
/// ``` /// ```
#[inline] #[inline]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn or(self, res: Result<T, E>) -> Result<T, E> { pub fn or<F>(self, res: Result<T, F>) -> Result<T, F> {
match self { match self {
Ok(_) => self, Ok(v) => Ok(v),
Err(_) => res, Err(_) => res,
} }
} }

4
src/libcoretest/result.rs
View File

@ -36,10 +36,10 @@ pub fn test_and_then() {
#[test] #[test]
pub fn test_or() { pub fn test_or() {
assert_eq!(op1().or(Ok(667)).unwrap(), 666); assert_eq!(op1().or(Ok::<_, &'static str>(667)).unwrap(), 666);
assert_eq!(op1().or(Err("bad")).unwrap(), 666); assert_eq!(op1().or(Err("bad")).unwrap(), 666);
assert_eq!(op2().or(Ok(667)).unwrap(), 667); assert_eq!(op2().or(Ok::<_, &'static str>(667)).unwrap(), 667);
assert_eq!(op2().or(Err("bad")).unwrap_err(), "bad"); assert_eq!(op2().or(Err("bad")).unwrap_err(), "bad");
} }