2014-01-25 01:37:51 -06:00
|
|
|
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
|
2012-12-03 18:48:01 -06:00
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2014-04-12 18:33:21 -05:00
|
|
|
//! Error handling with the `Result` type
|
|
|
|
//!
|
2014-07-04 08:23:17 -05:00
|
|
|
//! `Result<T, E>` is the type used for returning and propagating
|
2014-04-12 18:33:21 -05:00
|
|
|
//! errors. It is an enum with the variants, `Ok(T)`, representing
|
|
|
|
//! success and containing a value, and `Err(E)`, representing error
|
|
|
|
//! and containing an error value.
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//! enum Result<T, E> {
|
|
|
|
//! Ok(T),
|
|
|
|
//! Err(E)
|
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! Functions return `Result` whenever errors are expected and
|
|
|
|
//! recoverable. In the `std` crate `Result` is most prominently used
|
2014-05-09 15:57:37 -05:00
|
|
|
//! for [I/O](../../std/io/index.html).
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! A simple function returning `Result` might be
|
|
|
|
//! defined and used like so:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-01-28 07:34:18 -06:00
|
|
|
//! #[derive(Debug)]
|
2014-04-12 18:33:21 -05:00
|
|
|
//! enum Version { Version1, Version2 }
|
|
|
|
//!
|
|
|
|
//! fn parse_version(header: &[u8]) -> Result<Version, &'static str> {
|
2015-04-03 20:32:29 -05:00
|
|
|
//! match header.get(0) {
|
|
|
|
//! None => Err("invalid header length"),
|
|
|
|
//! Some(&1) => Ok(Version::Version1),
|
|
|
|
//! Some(&2) => Ok(Version::Version2),
|
|
|
|
//! Some(_) => Err("invalid version")
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
|
|
|
//! }
|
|
|
|
//!
|
|
|
|
//! let version = parse_version(&[1, 2, 3, 4]);
|
|
|
|
//! match version {
|
2015-04-03 20:09:11 -05:00
|
|
|
//! Ok(v) => println!("working with version: {:?}", v),
|
|
|
|
//! Err(e) => println!("error parsing header: {:?}", e),
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! Pattern matching on `Result`s is clear and straightforward for
|
|
|
|
//! simple cases, but `Result` comes with some convenience methods
|
2014-11-22 21:13:00 -06:00
|
|
|
//! that make working with it more succinct.
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-03-25 19:06:52 -05:00
|
|
|
//! let good_result: Result<i32, i32> = Ok(10);
|
|
|
|
//! let bad_result: Result<i32, i32> = Err(10);
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! // The `is_ok` and `is_err` methods do what they say.
|
|
|
|
//! assert!(good_result.is_ok() && !good_result.is_err());
|
|
|
|
//! assert!(bad_result.is_err() && !bad_result.is_ok());
|
|
|
|
//!
|
|
|
|
//! // `map` consumes the `Result` and produces another.
|
2015-03-25 19:06:52 -05:00
|
|
|
//! let good_result: Result<i32, i32> = good_result.map(|i| i + 1);
|
|
|
|
//! let bad_result: Result<i32, i32> = bad_result.map(|i| i - 1);
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! // Use `and_then` to continue the computation.
|
2015-03-25 19:06:52 -05:00
|
|
|
//! let good_result: Result<bool, i32> = good_result.and_then(|i| Ok(i == 11));
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! // Use `or_else` to handle the error.
|
2015-04-06 15:47:24 -05:00
|
|
|
//! let bad_result: Result<i32, i32> = bad_result.or_else(|i| Ok(i + 20));
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-04-15 01:12:34 -05:00
|
|
|
//! // Consume the result and return the contents with `unwrap`.
|
2015-03-20 02:19:13 -05:00
|
|
|
//! let final_awesome_result = good_result.unwrap();
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! # Results must be used
|
|
|
|
//!
|
2014-04-15 01:12:34 -05:00
|
|
|
//! A common problem with using return values to indicate errors is
|
|
|
|
//! that it is easy to ignore the return value, thus failing to handle
|
|
|
|
//! the error. Result is annotated with the #[must_use] attribute,
|
|
|
|
//! which will cause the compiler to issue a warning when a Result
|
|
|
|
//! value is ignored. This makes `Result` especially useful with
|
|
|
|
//! functions that may encounter errors but don't otherwise return a
|
|
|
|
//! useful value.
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! Consider the `write_all` method defined for I/O types
|
2015-04-16 15:12:13 -05:00
|
|
|
//! by the [`Write`](../../std/io/trait.Write.html) trait:
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-04-10 15:23:17 -05:00
|
|
|
//! use std::io;
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-16 15:12:13 -05:00
|
|
|
//! trait Write {
|
2015-04-10 15:23:17 -05:00
|
|
|
//! fn write_all(&mut self, bytes: &[u8]) -> Result<(), io::Error>;
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! *Note: The actual definition of `Write` uses `io::Result`, which
|
|
|
|
//! is just a synonym for `Result<T, io::Error>`.*
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-06-08 23:00:52 -05:00
|
|
|
//! This method doesn't produce a value, but the write may
|
2014-04-12 18:33:21 -05:00
|
|
|
//! fail. It's crucial to handle the error case, and *not* write
|
|
|
|
//! something like this:
|
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! ```no_run
|
|
|
|
//! use std::fs::File;
|
|
|
|
//! use std::io::prelude::*;
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! let mut file = File::create("valuable_data.txt").unwrap();
|
|
|
|
//! // If `write_all` errors, then we'll never know, because the return
|
2014-04-12 18:33:21 -05:00
|
|
|
//! // value is ignored.
|
2015-04-10 15:23:17 -05:00
|
|
|
//! file.write_all(b"important message");
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-01-13 12:24:48 -06:00
|
|
|
//! If you *do* write that in Rust, the compiler will give you a
|
2014-04-12 18:33:21 -05:00
|
|
|
//! warning (by default, controlled by the `unused_must_use` lint).
|
|
|
|
//!
|
|
|
|
//! You might instead, if you don't want to handle the error, simply
|
2014-10-09 14:17:22 -05:00
|
|
|
//! panic, by converting to an `Option` with `ok`, then asserting
|
|
|
|
//! success with `expect`. This will panic if the write fails, proving
|
2014-04-12 18:33:21 -05:00
|
|
|
//! a marginally useful message indicating why:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```{.no_run}
|
2015-04-10 15:23:17 -05:00
|
|
|
//! use std::fs::File;
|
|
|
|
//! use std::io::prelude::*;
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! let mut file = File::create("valuable_data.txt").unwrap();
|
|
|
|
//! file.write_all(b"important message").ok().expect("failed to write message");
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! You might also simply assert success:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```{.no_run}
|
2015-04-10 15:23:17 -05:00
|
|
|
//! # use std::fs::File;
|
|
|
|
//! # use std::io::prelude::*;
|
|
|
|
//! # let mut file = File::create("valuable_data.txt").unwrap();
|
|
|
|
//! assert!(file.write_all(b"important message").is_ok());
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! Or propagate the error up the call stack with `try!`:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-04-10 15:23:17 -05:00
|
|
|
//! # use std::fs::File;
|
|
|
|
//! # use std::io::prelude::*;
|
|
|
|
//! # use std::io;
|
|
|
|
//! fn write_message() -> io::Result<()> {
|
|
|
|
//! let mut file = try!(File::create("valuable_data.txt"));
|
|
|
|
//! try!(file.write_all(b"important message"));
|
2015-04-06 02:06:24 -05:00
|
|
|
//! Ok(())
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! # The `try!` macro
|
|
|
|
//!
|
|
|
|
//! When writing code that calls many functions that return the
|
|
|
|
//! `Result` type, the error handling can be tedious. The `try!`
|
|
|
|
//! macro hides some of the boilerplate of propagating errors up the
|
|
|
|
//! call stack.
|
|
|
|
//!
|
|
|
|
//! It replaces this:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-04-10 15:23:17 -05:00
|
|
|
//! use std::fs::File;
|
|
|
|
//! use std::io::prelude::*;
|
|
|
|
//! use std::io;
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-05-20 01:19:56 -05:00
|
|
|
//! struct Info {
|
2014-05-22 18:57:53 -05:00
|
|
|
//! name: String,
|
2015-03-25 19:06:52 -05:00
|
|
|
//! age: i32,
|
|
|
|
//! rating: i32,
|
2014-05-20 01:19:56 -05:00
|
|
|
//! }
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! fn write_info(info: &Info) -> io::Result<()> {
|
|
|
|
//! let mut file = try!(File::create("my_best_friends.txt"));
|
2014-04-12 18:33:21 -05:00
|
|
|
//! // Early return on error
|
2015-04-10 15:23:17 -05:00
|
|
|
//! if let Err(e) = file.write_all(format!("name: {}\n", info.name).as_bytes()) {
|
|
|
|
//! return Err(e)
|
|
|
|
//! }
|
|
|
|
//! if let Err(e) = file.write_all(format!("age: {}\n", info.age).as_bytes()) {
|
2015-01-13 12:25:13 -06:00
|
|
|
//! return Err(e)
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2015-04-10 15:23:17 -05:00
|
|
|
//! if let Err(e) = file.write_all(format!("rating: {}\n", info.rating).as_bytes()) {
|
2015-01-13 12:25:13 -06:00
|
|
|
//! return Err(e)
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2015-04-10 15:23:17 -05:00
|
|
|
//! Ok(())
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! With this:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-04-10 15:23:17 -05:00
|
|
|
//! use std::fs::File;
|
|
|
|
//! use std::io::prelude::*;
|
|
|
|
//! use std::io;
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2014-05-20 01:19:56 -05:00
|
|
|
//! struct Info {
|
2014-05-22 18:57:53 -05:00
|
|
|
//! name: String,
|
2015-03-25 19:06:52 -05:00
|
|
|
//! age: i32,
|
|
|
|
//! rating: i32,
|
2014-05-20 01:19:56 -05:00
|
|
|
//! }
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-04-10 15:23:17 -05:00
|
|
|
//! fn write_info(info: &Info) -> io::Result<()> {
|
|
|
|
//! let mut file = try!(File::create("my_best_friends.txt"));
|
2014-04-12 18:33:21 -05:00
|
|
|
//! // Early return on error
|
2015-04-10 15:23:17 -05:00
|
|
|
//! try!(file.write_all(format!("name: {}\n", info.name).as_bytes()));
|
|
|
|
//! try!(file.write_all(format!("age: {}\n", info.age).as_bytes()));
|
|
|
|
//! try!(file.write_all(format!("rating: {}\n", info.rating).as_bytes()));
|
2015-04-06 02:06:24 -05:00
|
|
|
//! Ok(())
|
2014-04-12 18:33:21 -05:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
|
|
|
//! *It's much nicer!*
|
|
|
|
//!
|
|
|
|
//! Wrapping an expression in `try!` will result in the unwrapped
|
|
|
|
//! success (`Ok`) value, unless the result is `Err`, in which case
|
|
|
|
//! `Err` is returned early from the enclosing function. Its simple definition
|
|
|
|
//! makes it clear:
|
|
|
|
//!
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2015-01-02 16:44:21 -06:00
|
|
|
//! macro_rules! try {
|
2014-04-12 18:33:21 -05:00
|
|
|
//! ($e:expr) => (match $e { Ok(e) => e, Err(e) => return Err(e) })
|
2015-01-02 16:44:21 -06:00
|
|
|
//! }
|
2014-09-16 06:27:34 -05:00
|
|
|
//! ```
|
2014-04-12 18:33:21 -05:00
|
|
|
//!
|
2015-06-03 09:12:16 -05:00
|
|
|
//! `try!` is imported by the prelude and is available everywhere, but it can only
|
|
|
|
//! be used in functions that return `Result` because of the early return of
|
|
|
|
//! `Err` that it provides.
|
2011-12-13 18:25:51 -06:00
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#![stable(feature = "rust1", since = "1.0.0")]
|
2014-08-19 15:45:28 -05:00
|
|
|
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
use self::Result::{Ok, Err};
|
2014-11-06 02:05:53 -06:00
|
|
|
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
use clone::Clone;
|
std: Stabilize the std::fmt module
This commit performs a final stabilization pass over the std::fmt module,
marking all necessary APIs as stable. One of the more interesting aspects of
this module is that it exposes a good deal of its runtime representation to the
outside world in order for `format_args!` to be able to construct the format
strings. Instead of hacking the compiler to assume that these items are stable,
this commit instead lays out a story for the stabilization and evolution of
these APIs.
There are three primary details used by the `format_args!` macro:
1. `Arguments` - an opaque package of a "compiled format string". This structure
is passed around and the `write` function is the source of truth for
transforming a compiled format string into a string at runtime. This must be
able to be constructed in stable code.
2. `Argument` - an opaque structure representing an argument to a format string.
This is *almost* a trait object as it's just a pointer/function pair, but due
to the function originating from one of many traits, it's not actually a
trait object. Like `Arguments`, this must be constructed from stable code.
3. `fmt::rt` - this module contains the runtime type definitions primarily for
the `rt::Argument` structure. Whenever an argument is formatted with
nonstandard flags, a corresponding `rt::Argument` is generated describing how
the argument is being formatted. This can be used to construct an
`Arguments`.
The primary interface to `std::fmt` is the `Arguments` structure, and as such
this type name is stabilize as-is today. It is expected for libraries to pass
around an `Arguments` structure to represent a pending formatted computation.
The remaining portions are largely "cruft" which would rather not be stabilized,
but due to the stability checks they must be. As a result, almost all pieces
have been renamed to represent that they are "version 1" of the formatting
representation. The theory is that at a later date if we change the
representation of these types we can add new definitions called "version 2" and
corresponding constructors for `Arguments`.
One of the other remaining large questions about the fmt module were how the
pending I/O reform would affect the signatures of methods in the module. Due to
[RFC 526][rfc], however, the writers of fmt are now incompatible with the
writers of io, so this question has largely been solved. As a result the
interfaces are largely stabilized as-is today.
[rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0526-fmt-text-writer.md
Specifically, the following changes were made:
* The contents of `fmt::rt` were all moved under `fmt::rt::v1`
* `fmt::rt` is stable
* `fmt::rt::v1` is stable
* `Error` is stable
* `Writer` is stable
* `Writer::write_str` is stable
* `Writer::write_fmt` is stable
* `Formatter` is stable
* `Argument` has been renamed to `ArgumentV1` and is stable
* `ArgumentV1::new` is stable
* `ArgumentV1::from_uint` is stable
* `Arguments::new_v1` is stable (renamed from `new`)
* `Arguments::new_v1_formatted` is stable (renamed from `with_placeholders`)
* All formatting traits are now stable, as well as the `fmt` method.
* `fmt::write` is stable
* `fmt::format` is stable
* `Formatter::pad_integral` is stable
* `Formatter::pad` is stable
* `Formatter::write_str` is stable
* `Formatter::write_fmt` is stable
* Some assorted top level items which were only used by `format_args!` were
removed in favor of static functions on `ArgumentV1` as well.
* The formatting-flag-accessing methods remain unstable
Within the contents of the `fmt::rt::v1` module, the following actions were
taken:
* Reexports of all enum variants were removed
* All prefixes on enum variants were removed
* A few miscellaneous enum variants were renamed
* Otherwise all structs, fields, and variants were marked stable.
In addition to these actions in the `std::fmt` module, many implementations of
`Show` and `String` were stabilized as well.
In some other modules:
* `ToString` is now stable
* `ToString::to_string` is now stable
* `Vec` no longer implements `fmt::Writer` (this has moved to `String`)
This is a breaking change due to all of the changes to the `fmt::rt` module, but
this likely will not have much impact on existing programs.
Closes #20661
[breaking-change]
2015-01-13 17:42:53 -06:00
|
|
|
use fmt;
|
2015-03-12 00:41:24 -05:00
|
|
|
use iter::{Iterator, DoubleEndedIterator, FromIterator, ExactSizeIterator, IntoIterator};
|
2014-12-02 11:47:07 -06:00
|
|
|
use ops::{FnMut, FnOnce};
|
2015-01-03 21:42:21 -06:00
|
|
|
use option::Option::{self, None, Some};
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
use slice;
|
2013-08-03 18:59:24 -05:00
|
|
|
|
|
|
|
/// `Result` is a type that represents either success (`Ok`) or failure (`Err`).
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
|
|
|
/// See the [`std::result`](index.html) module documentation for details.
|
2015-01-28 07:34:18 -06:00
|
|
|
#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
|
2014-01-23 11:53:05 -06:00
|
|
|
#[must_use]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-08-03 18:59:24 -05:00
|
|
|
pub enum Result<T, E> {
|
2013-12-06 15:23:23 -06:00
|
|
|
/// Contains the success value
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2012-08-26 18:54:31 -05:00
|
|
|
Ok(T),
|
2013-12-06 15:23:23 -06:00
|
|
|
|
2012-07-04 16:53:12 -05:00
|
|
|
/// Contains the error value
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-08-03 18:59:24 -05:00
|
|
|
Err(E)
|
2011-12-13 18:25:51 -06:00
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// Type implementation
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-12-06 15:23:23 -06:00
|
|
|
impl<T, E> Result<T, E> {
|
2013-10-31 17:09:24 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
// Querying the contained values
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
2013-04-10 15:11:35 -05:00
|
|
|
|
2013-07-24 22:41:13 -05:00
|
|
|
/// Returns true if the result is `Ok`
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let x: Result<i32, &str> = Ok(-3);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.is_ok(), true);
|
|
|
|
///
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let x: Result<i32, &str> = Err("Some error message");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.is_ok(), false);
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-07-26 20:03:44 -05:00
|
|
|
pub fn is_ok(&self) -> bool {
|
|
|
|
match *self {
|
|
|
|
Ok(_) => true,
|
|
|
|
Err(_) => false
|
|
|
|
}
|
|
|
|
}
|
2012-04-01 17:44:01 -05:00
|
|
|
|
2013-07-24 22:41:13 -05:00
|
|
|
/// Returns true if the result is `Err`
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let x: Result<i32, &str> = Ok(-3);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.is_err(), false);
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let x: Result<i32, &str> = Err("Some error message");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.is_err(), true);
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-07-26 20:03:44 -05:00
|
|
|
pub fn is_err(&self) -> bool {
|
|
|
|
!self.is_ok()
|
|
|
|
}
|
2012-04-01 17:44:01 -05:00
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
2013-12-06 15:23:23 -06:00
|
|
|
// Adapter for each variant
|
2013-10-31 17:09:24 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `Option<T>`
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
|
|
|
/// Converts `self` into an `Option<T>`, consuming `self`,
|
|
|
|
/// and discarding the error, if any.
|
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.ok(), Some(2));
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("Nothing here");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.ok(), None);
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-12-06 15:23:23 -06:00
|
|
|
pub fn ok(self) -> Option<T> {
|
2013-07-26 20:03:57 -05:00
|
|
|
match self {
|
2013-12-06 15:23:23 -06:00
|
|
|
Ok(x) => Some(x),
|
|
|
|
Err(_) => None,
|
2013-07-26 20:03:57 -05:00
|
|
|
}
|
|
|
|
}
|
2012-12-18 20:55:19 -06:00
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `Option<E>`
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2014-12-25 23:31:48 -06:00
|
|
|
/// Converts `self` into an `Option<E>`, consuming `self`,
|
2015-03-18 07:36:23 -05:00
|
|
|
/// and discarding the success value, if any.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.err(), None);
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("Nothing here");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.err(), Some("Nothing here"));
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-12-06 15:23:23 -06:00
|
|
|
pub fn err(self) -> Option<E> {
|
2013-10-31 17:09:24 -05:00
|
|
|
match self {
|
2013-12-06 15:23:23 -06:00
|
|
|
Ok(_) => None,
|
|
|
|
Err(x) => Some(x),
|
2013-10-31 17:09:24 -05:00
|
|
|
}
|
2013-08-03 18:59:24 -05:00
|
|
|
}
|
|
|
|
|
2013-12-06 15:23:23 -06:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
// Adapter for working with references
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `Result<&T, &E>`
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
|
|
|
/// Produces a new `Result`, containing a reference
|
|
|
|
/// into the original, leaving the original in place.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.as_ref(), Ok(&2));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("Error");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.as_ref(), Err(&"Error"));
|
|
|
|
/// ```
|
2013-08-03 18:59:24 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub fn as_ref(&self) -> Result<&T, &E> {
|
2013-12-06 15:23:23 -06:00
|
|
|
match *self {
|
|
|
|
Ok(ref x) => Ok(x),
|
|
|
|
Err(ref x) => Err(x),
|
2013-08-03 18:59:24 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `Result<&mut T, &mut E>`
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-03-25 19:06:52 -05:00
|
|
|
/// fn mutate(r: &mut Result<i32, i32>) {
|
2014-09-16 10:09:24 -05:00
|
|
|
/// match r.as_mut() {
|
2015-01-07 18:26:00 -06:00
|
|
|
/// Ok(&mut ref mut v) => *v = 42,
|
|
|
|
/// Err(&mut ref mut e) => *e = 0,
|
2014-09-16 10:09:24 -05:00
|
|
|
/// }
|
|
|
|
/// }
|
|
|
|
///
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let mut x: Result<i32, i32> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// mutate(&mut x);
|
|
|
|
/// assert_eq!(x.unwrap(), 42);
|
|
|
|
///
|
2015-03-25 19:06:52 -05:00
|
|
|
/// let mut x: Result<i32, i32> = Err(13);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// mutate(&mut x);
|
|
|
|
/// assert_eq!(x.unwrap_err(), 0);
|
|
|
|
/// ```
|
2013-08-03 18:59:24 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub fn as_mut(&mut self) -> Result<&mut T, &mut E> {
|
2013-12-06 15:23:23 -06:00
|
|
|
match *self {
|
|
|
|
Ok(ref mut x) => Ok(x),
|
|
|
|
Err(ref mut x) => Err(x),
|
2013-07-26 20:03:57 -05:00
|
|
|
}
|
|
|
|
}
|
2012-12-18 20:55:19 -06:00
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `&[T]` (without copying)
|
2015-03-18 11:14:54 -05:00
|
|
|
#[inline]
|
|
|
|
#[unstable(feature = "as_slice", since = "unsure of the utility here")]
|
|
|
|
pub fn as_slice(&self) -> &[T] {
|
|
|
|
match *self {
|
|
|
|
Ok(ref x) => slice::ref_slice(x),
|
|
|
|
Err(_) => {
|
|
|
|
// work around lack of implicit coercion from fixed-size array to slice
|
|
|
|
let emp: &[_] = &[];
|
|
|
|
emp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Converts from `Result<T, E>` to `&mut [T]` (without copying)
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-06-10 15:33:52 -05:00
|
|
|
/// # #![feature(as_slice)]
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let mut x: Result<&str, u32> = Ok("Gold");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// {
|
|
|
|
/// let v = x.as_mut_slice();
|
2014-11-21 00:20:04 -06:00
|
|
|
/// assert!(v == ["Gold"]);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// v[0] = "Silver";
|
2014-11-21 00:20:04 -06:00
|
|
|
/// assert!(v == ["Silver"]);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// }
|
|
|
|
/// assert_eq!(x, Ok("Silver"));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let mut x: Result<&str, u32> = Err(45);
|
2014-11-21 00:20:04 -06:00
|
|
|
/// assert!(x.as_mut_slice().is_empty());
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
2015-06-09 13:18:03 -05:00
|
|
|
#[unstable(feature = "as_slice",
|
2015-01-12 20:40:19 -06:00
|
|
|
reason = "waiting for mut conventions")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub fn as_mut_slice(&mut self) -> &mut [T] {
|
2014-08-19 15:45:28 -05:00
|
|
|
match *self {
|
|
|
|
Ok(ref mut x) => slice::mut_ref_slice(x),
|
|
|
|
Err(_) => {
|
|
|
|
// work around lack of implicit coercion from fixed-size array to slice
|
|
|
|
let emp: &mut [_] = &mut [];
|
|
|
|
emp
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
// Transforming contained values
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2014-01-30 12:29:35 -06:00
|
|
|
/// Maps a `Result<T, E>` to `Result<U, E>` by applying a function to an
|
2013-10-31 17:09:24 -05:00
|
|
|
/// contained `Ok` value, leaving an `Err` value untouched.
|
2013-08-04 18:05:25 -05:00
|
|
|
///
|
2013-10-31 17:09:24 -05:00
|
|
|
/// This function can be used to compose the results of two functions.
|
2013-08-04 18:05:25 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-04-10 15:23:17 -05:00
|
|
|
/// Print the numbers on each line of a string multiplied by two.
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2014-09-16 06:27:34 -05:00
|
|
|
/// ```
|
2015-04-10 15:23:17 -05:00
|
|
|
/// let line = "1\n2\n3\n4\n";
|
2014-04-12 18:33:21 -05:00
|
|
|
///
|
2015-04-10 15:23:17 -05:00
|
|
|
/// for num in line.lines() {
|
|
|
|
/// match num.parse::<i32>().map(|i| i * 2) {
|
|
|
|
/// Ok(n) => println!("{}", n),
|
|
|
|
/// Err(..) => {}
|
|
|
|
/// }
|
2014-04-12 18:33:21 -05:00
|
|
|
/// }
|
2014-09-16 06:27:34 -05:00
|
|
|
/// ```
|
2013-08-04 18:05:25 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-02 11:47:07 -06:00
|
|
|
pub fn map<U, F: FnOnce(T) -> U>(self, op: F) -> Result<U,E> {
|
2013-08-04 18:05:25 -05:00
|
|
|
match self {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
Ok(t) => Ok(op(t)),
|
|
|
|
Err(e) => Err(e)
|
2013-08-04 18:05:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-30 12:29:35 -06:00
|
|
|
/// Maps a `Result<T, E>` to `Result<T, F>` by applying a function to an
|
2013-10-31 17:09:24 -05:00
|
|
|
/// contained `Err` value, leaving an `Ok` value untouched.
|
2013-08-04 18:05:25 -05:00
|
|
|
///
|
2013-10-31 17:09:24 -05:00
|
|
|
/// This function can be used to pass through a successful result while handling
|
|
|
|
/// an error.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// fn stringify(x: u32) -> String { format!("error code: {}", x) }
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, u32> = Ok(2);
|
2015-01-22 08:08:56 -06:00
|
|
|
/// assert_eq!(x.map_err(stringify), Ok(2));
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, u32> = Err(13);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.map_err(stringify), Err("error code: 13".to_string()));
|
|
|
|
/// ```
|
2013-08-04 18:05:25 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-02 11:47:07 -06:00
|
|
|
pub fn map_err<F, O: FnOnce(E) -> F>(self, op: O) -> Result<T,F> {
|
2013-08-04 18:05:25 -05:00
|
|
|
match self {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
Ok(t) => Ok(t),
|
|
|
|
Err(e) => Err(op(e))
|
2013-08-04 18:05:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
// Iterator constructors
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
/// Returns an iterator over the possibly contained value.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(7);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.iter().next(), Some(&7));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("nothing!");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.iter().next(), None);
|
|
|
|
/// ```
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub fn iter(&self) -> Iter<T> {
|
|
|
|
Iter { inner: self.as_ref().ok() }
|
2014-08-19 15:45:28 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a mutable iterator over the possibly contained value.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let mut x: Result<u32, &str> = Ok(7);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// match x.iter_mut().next() {
|
2015-01-07 18:26:00 -06:00
|
|
|
/// Some(&mut ref mut x) => *x = 40,
|
2014-09-16 10:09:24 -05:00
|
|
|
/// None => {},
|
|
|
|
/// }
|
|
|
|
/// assert_eq!(x, Ok(40));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let mut x: Result<u32, &str> = Err("nothing!");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.iter_mut().next(), None);
|
|
|
|
/// ```
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub fn iter_mut(&mut self) -> IterMut<T> {
|
|
|
|
IterMut { inner: self.as_mut().ok() }
|
2014-08-19 15:45:28 -05:00
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
////////////////////////////////////////////////////////////////////////
|
|
|
|
// Boolean operations on the values, eager and lazy
|
|
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
/// Returns `res` if the result is `Ok`, otherwise returns the `Err` value of `self`.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// let y: Result<&str, &str> = Err("late error");
|
|
|
|
/// assert_eq!(x.and(y), Err("late error"));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("early error");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// let y: Result<&str, &str> = Ok("foo");
|
|
|
|
/// assert_eq!(x.and(y), Err("early error"));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("not a 2");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// let y: Result<&str, &str> = Err("late error");
|
|
|
|
/// assert_eq!(x.and(y), Err("not a 2"));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// let y: Result<&str, &str> = Ok("different result type");
|
|
|
|
/// assert_eq!(x.and(y), Ok("different result type"));
|
|
|
|
/// ```
|
2013-10-31 17:09:24 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2013-10-31 17:09:24 -05:00
|
|
|
pub fn and<U>(self, res: Result<U, E>) -> Result<U, E> {
|
2013-09-11 14:52:17 -05:00
|
|
|
match self {
|
|
|
|
Ok(_) => res,
|
2013-10-31 17:09:24 -05:00
|
|
|
Err(e) => Err(e),
|
2013-09-11 14:52:17 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/// Calls `op` if the result is `Ok`, otherwise returns the `Err` value of `self`.
|
2013-08-03 18:59:24 -05:00
|
|
|
///
|
2014-09-16 10:09:24 -05:00
|
|
|
/// This function can be used for control flow based on result values.
|
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// fn sq(x: u32) -> Result<u32, u32> { Ok(x * x) }
|
|
|
|
/// fn err(x: u32) -> Result<u32, u32> { Err(x) }
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// assert_eq!(Ok(2).and_then(sq).and_then(sq), Ok(16));
|
|
|
|
/// assert_eq!(Ok(2).and_then(sq).and_then(err), Err(4));
|
|
|
|
/// assert_eq!(Ok(2).and_then(err).and_then(sq), Err(2));
|
|
|
|
/// assert_eq!(Err(3).and_then(sq).and_then(sq), Err(3));
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-02 11:47:07 -06:00
|
|
|
pub fn and_then<U, F: FnOnce(T) -> Result<U, E>>(self, op: F) -> Result<U, E> {
|
2013-07-22 19:27:53 -05:00
|
|
|
match self {
|
|
|
|
Ok(t) => op(t),
|
2013-07-24 22:41:13 -05:00
|
|
|
Err(e) => Err(e),
|
2013-07-22 19:27:53 -05:00
|
|
|
}
|
2012-05-26 22:33:08 -05:00
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/// Returns `res` if the result is `Err`, otherwise returns the `Ok` value of `self`.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
|
|
|
/// let y: Result<u32, &str> = Err("late error");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.or(y), Ok(2));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("early error");
|
|
|
|
/// let y: Result<u32, &str> = Ok(2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.or(y), Ok(2));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("not a 2");
|
|
|
|
/// let y: Result<u32, &str> = Err("late error");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.or(y), Err("late error"));
|
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
|
|
|
/// let y: Result<u32, &str> = Ok(100);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.or(y), Ok(2));
|
|
|
|
/// ```
|
2013-09-11 14:52:17 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2015-02-25 12:37:22 -06:00
|
|
|
pub fn or<F>(self, res: Result<T, F>) -> Result<T, F> {
|
2013-09-11 14:52:17 -05:00
|
|
|
match self {
|
2015-02-25 12:37:22 -06:00
|
|
|
Ok(v) => Ok(v),
|
2013-09-11 14:52:17 -05:00
|
|
|
Err(_) => res,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-31 17:09:24 -05:00
|
|
|
/// Calls `op` if the result is `Err`, otherwise returns the `Ok` value of `self`.
|
2013-08-03 18:59:24 -05:00
|
|
|
///
|
2014-09-16 10:09:24 -05:00
|
|
|
/// This function can be used for control flow based on result values.
|
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// fn sq(x: u32) -> Result<u32, u32> { Ok(x * x) }
|
|
|
|
/// fn err(x: u32) -> Result<u32, u32> { Err(x) }
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// assert_eq!(Ok(2).or_else(sq).or_else(sq), Ok(2));
|
|
|
|
/// assert_eq!(Ok(2).or_else(err).or_else(sq), Ok(2));
|
|
|
|
/// assert_eq!(Err(3).or_else(sq).or_else(err), Ok(9));
|
|
|
|
/// assert_eq!(Err(3).or_else(err).or_else(err), Err(3));
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-02 11:47:07 -06:00
|
|
|
pub fn or_else<F, O: FnOnce(E) -> Result<T, F>>(self, op: O) -> Result<T, F> {
|
2013-07-22 19:27:53 -05:00
|
|
|
match self {
|
|
|
|
Ok(t) => Ok(t),
|
2013-07-24 22:41:13 -05:00
|
|
|
Err(e) => op(e),
|
2013-07-22 19:27:53 -05:00
|
|
|
}
|
2012-05-26 22:33:08 -05:00
|
|
|
}
|
2012-06-22 19:32:52 -05:00
|
|
|
|
2013-12-06 15:23:23 -06:00
|
|
|
/// Unwraps a result, yielding the content of an `Ok`.
|
2014-04-11 22:59:18 -05:00
|
|
|
/// Else it returns `optb`.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-01-22 08:08:56 -06:00
|
|
|
/// let optb = 2;
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(9);
|
2015-01-22 08:08:56 -06:00
|
|
|
/// assert_eq!(x.unwrap_or(optb), 9);
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("error");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.unwrap_or(optb), optb);
|
|
|
|
/// ```
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-04-11 22:59:18 -05:00
|
|
|
pub fn unwrap_or(self, optb: T) -> T {
|
2013-12-06 15:23:23 -06:00
|
|
|
match self {
|
|
|
|
Ok(t) => t,
|
2014-04-11 22:59:18 -05:00
|
|
|
Err(_) => optb
|
2013-12-06 15:23:23 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-11 21:18:02 -05:00
|
|
|
/// Unwraps a result, yielding the content of an `Ok`.
|
2014-04-11 22:59:18 -05:00
|
|
|
/// If the value is an `Err` then it calls `op` with its value.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// fn count(x: &str) -> usize { x.len() }
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-01-22 08:08:56 -06:00
|
|
|
/// assert_eq!(Ok(2).unwrap_or_else(count), 2);
|
|
|
|
/// assert_eq!(Err("foo").unwrap_or_else(count), 3);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2014-04-11 21:18:02 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-02 11:47:07 -06:00
|
|
|
pub fn unwrap_or_else<F: FnOnce(E) -> T>(self, op: F) -> T {
|
2014-04-11 21:18:02 -05:00
|
|
|
match self {
|
|
|
|
Ok(t) => t,
|
2014-04-11 22:59:18 -05:00
|
|
|
Err(e) => op(e)
|
2014-04-11 21:18:02 -05:00
|
|
|
}
|
|
|
|
}
|
2014-04-11 22:59:18 -05:00
|
|
|
}
|
2014-04-11 21:18:02 -05:00
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Stabilize the std::fmt module
This commit performs a final stabilization pass over the std::fmt module,
marking all necessary APIs as stable. One of the more interesting aspects of
this module is that it exposes a good deal of its runtime representation to the
outside world in order for `format_args!` to be able to construct the format
strings. Instead of hacking the compiler to assume that these items are stable,
this commit instead lays out a story for the stabilization and evolution of
these APIs.
There are three primary details used by the `format_args!` macro:
1. `Arguments` - an opaque package of a "compiled format string". This structure
is passed around and the `write` function is the source of truth for
transforming a compiled format string into a string at runtime. This must be
able to be constructed in stable code.
2. `Argument` - an opaque structure representing an argument to a format string.
This is *almost* a trait object as it's just a pointer/function pair, but due
to the function originating from one of many traits, it's not actually a
trait object. Like `Arguments`, this must be constructed from stable code.
3. `fmt::rt` - this module contains the runtime type definitions primarily for
the `rt::Argument` structure. Whenever an argument is formatted with
nonstandard flags, a corresponding `rt::Argument` is generated describing how
the argument is being formatted. This can be used to construct an
`Arguments`.
The primary interface to `std::fmt` is the `Arguments` structure, and as such
this type name is stabilize as-is today. It is expected for libraries to pass
around an `Arguments` structure to represent a pending formatted computation.
The remaining portions are largely "cruft" which would rather not be stabilized,
but due to the stability checks they must be. As a result, almost all pieces
have been renamed to represent that they are "version 1" of the formatting
representation. The theory is that at a later date if we change the
representation of these types we can add new definitions called "version 2" and
corresponding constructors for `Arguments`.
One of the other remaining large questions about the fmt module were how the
pending I/O reform would affect the signatures of methods in the module. Due to
[RFC 526][rfc], however, the writers of fmt are now incompatible with the
writers of io, so this question has largely been solved. As a result the
interfaces are largely stabilized as-is today.
[rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0526-fmt-text-writer.md
Specifically, the following changes were made:
* The contents of `fmt::rt` were all moved under `fmt::rt::v1`
* `fmt::rt` is stable
* `fmt::rt::v1` is stable
* `Error` is stable
* `Writer` is stable
* `Writer::write_str` is stable
* `Writer::write_fmt` is stable
* `Formatter` is stable
* `Argument` has been renamed to `ArgumentV1` and is stable
* `ArgumentV1::new` is stable
* `ArgumentV1::from_uint` is stable
* `Arguments::new_v1` is stable (renamed from `new`)
* `Arguments::new_v1_formatted` is stable (renamed from `with_placeholders`)
* All formatting traits are now stable, as well as the `fmt` method.
* `fmt::write` is stable
* `fmt::format` is stable
* `Formatter::pad_integral` is stable
* `Formatter::pad` is stable
* `Formatter::write_str` is stable
* `Formatter::write_fmt` is stable
* Some assorted top level items which were only used by `format_args!` were
removed in favor of static functions on `ArgumentV1` as well.
* The formatting-flag-accessing methods remain unstable
Within the contents of the `fmt::rt::v1` module, the following actions were
taken:
* Reexports of all enum variants were removed
* All prefixes on enum variants were removed
* A few miscellaneous enum variants were renamed
* Otherwise all structs, fields, and variants were marked stable.
In addition to these actions in the `std::fmt` module, many implementations of
`Show` and `String` were stabilized as well.
In some other modules:
* `ToString` is now stable
* `ToString::to_string` is now stable
* `Vec` no longer implements `fmt::Writer` (this has moved to `String`)
This is a breaking change due to all of the changes to the `fmt::rt` module, but
this likely will not have much impact on existing programs.
Closes #20661
[breaking-change]
2015-01-13 17:42:53 -06:00
|
|
|
impl<T, E: fmt::Debug> Result<T, E> {
|
2014-05-10 15:46:05 -05:00
|
|
|
/// Unwraps a result, yielding the content of an `Ok`.
|
|
|
|
///
|
2014-10-09 14:17:22 -05:00
|
|
|
/// # Panics
|
2014-07-12 10:02:15 -05:00
|
|
|
///
|
2015-04-19 11:07:23 -05:00
|
|
|
/// Panics if the value is an `Err`, with a panic message provided by the
|
|
|
|
/// `Err`'s value.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2015-01-22 08:08:56 -06:00
|
|
|
/// assert_eq!(x.unwrap(), 2);
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
|
|
|
///
|
2015-03-26 15:30:33 -05:00
|
|
|
/// ```{.should_panic}
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("emergency failure");
|
2014-10-09 14:17:22 -05:00
|
|
|
/// x.unwrap(); // panics with `emergency failure`
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
2014-05-10 15:46:05 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-05-10 15:46:05 -05:00
|
|
|
pub fn unwrap(self) -> T {
|
|
|
|
match self {
|
|
|
|
Ok(t) => t,
|
|
|
|
Err(e) =>
|
2015-01-23 12:38:50 -06:00
|
|
|
panic!("called `Result::unwrap()` on an `Err` value: {:?}", e)
|
2014-05-10 15:46:05 -05:00
|
|
|
}
|
|
|
|
}
|
2015-06-13 09:34:58 -05:00
|
|
|
|
|
|
|
/// Unwraps a result, yielding the content of an `Ok`.
|
|
|
|
///
|
|
|
|
/// Panics if the value is an `Err`, with a panic message including the
|
|
|
|
/// passed message, and the content of the `Err`.
|
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
/// ```{.should_panic}
|
|
|
|
/// #![feature(result_expect)]
|
|
|
|
/// let x: Result<u32, &str> = Err("emergency failure");
|
|
|
|
/// x.expect("Testing expect"); // panics with `Testing expect: emergency failure`
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
#[unstable(feature = "result_expect", reason = "newly introduced")]
|
|
|
|
pub fn expect(self, msg: &str) -> T {
|
|
|
|
match self {
|
|
|
|
Ok(t) => t,
|
|
|
|
Err(e) => panic!("{}: {:?}", msg, e),
|
|
|
|
}
|
|
|
|
}
|
2014-05-10 15:46:05 -05:00
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Stabilize the std::fmt module
This commit performs a final stabilization pass over the std::fmt module,
marking all necessary APIs as stable. One of the more interesting aspects of
this module is that it exposes a good deal of its runtime representation to the
outside world in order for `format_args!` to be able to construct the format
strings. Instead of hacking the compiler to assume that these items are stable,
this commit instead lays out a story for the stabilization and evolution of
these APIs.
There are three primary details used by the `format_args!` macro:
1. `Arguments` - an opaque package of a "compiled format string". This structure
is passed around and the `write` function is the source of truth for
transforming a compiled format string into a string at runtime. This must be
able to be constructed in stable code.
2. `Argument` - an opaque structure representing an argument to a format string.
This is *almost* a trait object as it's just a pointer/function pair, but due
to the function originating from one of many traits, it's not actually a
trait object. Like `Arguments`, this must be constructed from stable code.
3. `fmt::rt` - this module contains the runtime type definitions primarily for
the `rt::Argument` structure. Whenever an argument is formatted with
nonstandard flags, a corresponding `rt::Argument` is generated describing how
the argument is being formatted. This can be used to construct an
`Arguments`.
The primary interface to `std::fmt` is the `Arguments` structure, and as such
this type name is stabilize as-is today. It is expected for libraries to pass
around an `Arguments` structure to represent a pending formatted computation.
The remaining portions are largely "cruft" which would rather not be stabilized,
but due to the stability checks they must be. As a result, almost all pieces
have been renamed to represent that they are "version 1" of the formatting
representation. The theory is that at a later date if we change the
representation of these types we can add new definitions called "version 2" and
corresponding constructors for `Arguments`.
One of the other remaining large questions about the fmt module were how the
pending I/O reform would affect the signatures of methods in the module. Due to
[RFC 526][rfc], however, the writers of fmt are now incompatible with the
writers of io, so this question has largely been solved. As a result the
interfaces are largely stabilized as-is today.
[rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0526-fmt-text-writer.md
Specifically, the following changes were made:
* The contents of `fmt::rt` were all moved under `fmt::rt::v1`
* `fmt::rt` is stable
* `fmt::rt::v1` is stable
* `Error` is stable
* `Writer` is stable
* `Writer::write_str` is stable
* `Writer::write_fmt` is stable
* `Formatter` is stable
* `Argument` has been renamed to `ArgumentV1` and is stable
* `ArgumentV1::new` is stable
* `ArgumentV1::from_uint` is stable
* `Arguments::new_v1` is stable (renamed from `new`)
* `Arguments::new_v1_formatted` is stable (renamed from `with_placeholders`)
* All formatting traits are now stable, as well as the `fmt` method.
* `fmt::write` is stable
* `fmt::format` is stable
* `Formatter::pad_integral` is stable
* `Formatter::pad` is stable
* `Formatter::write_str` is stable
* `Formatter::write_fmt` is stable
* Some assorted top level items which were only used by `format_args!` were
removed in favor of static functions on `ArgumentV1` as well.
* The formatting-flag-accessing methods remain unstable
Within the contents of the `fmt::rt::v1` module, the following actions were
taken:
* Reexports of all enum variants were removed
* All prefixes on enum variants were removed
* A few miscellaneous enum variants were renamed
* Otherwise all structs, fields, and variants were marked stable.
In addition to these actions in the `std::fmt` module, many implementations of
`Show` and `String` were stabilized as well.
In some other modules:
* `ToString` is now stable
* `ToString::to_string` is now stable
* `Vec` no longer implements `fmt::Writer` (this has moved to `String`)
This is a breaking change due to all of the changes to the `fmt::rt` module, but
this likely will not have much impact on existing programs.
Closes #20661
[breaking-change]
2015-01-13 17:42:53 -06:00
|
|
|
impl<T: fmt::Debug, E> Result<T, E> {
|
2014-05-10 15:46:05 -05:00
|
|
|
/// Unwraps a result, yielding the content of an `Err`.
|
|
|
|
///
|
2014-10-09 14:17:22 -05:00
|
|
|
/// # Panics
|
2014-07-12 10:02:15 -05:00
|
|
|
///
|
2014-10-09 14:17:22 -05:00
|
|
|
/// Panics if the value is an `Ok`, with a custom panic message provided
|
2014-07-12 10:02:15 -05:00
|
|
|
/// by the `Ok`'s value.
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-11 20:11:40 -05:00
|
|
|
/// # Examples
|
2014-09-16 10:09:24 -05:00
|
|
|
///
|
2015-03-26 15:30:33 -05:00
|
|
|
/// ```{.should_panic}
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Ok(2);
|
2014-10-09 14:17:22 -05:00
|
|
|
/// x.unwrap_err(); // panics with `2`
|
2014-09-16 10:09:24 -05:00
|
|
|
/// ```
|
|
|
|
///
|
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let x: Result<u32, &str> = Err("emergency failure");
|
2014-09-16 10:09:24 -05:00
|
|
|
/// assert_eq!(x.unwrap_err(), "emergency failure");
|
|
|
|
/// ```
|
2014-05-10 15:46:05 -05:00
|
|
|
#[inline]
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-05-10 15:46:05 -05:00
|
|
|
pub fn unwrap_err(self) -> E {
|
|
|
|
match self {
|
|
|
|
Ok(t) =>
|
2015-01-23 12:38:50 -06:00
|
|
|
panic!("called `Result::unwrap_err()` on an `Ok` value: {:?}", t),
|
2014-05-10 15:46:05 -05:00
|
|
|
Err(e) => e
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-06 21:55:52 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// Trait implementations
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-04-17 16:31:30 -05:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
|
|
|
impl<T, E> IntoIterator for Result<T, E> {
|
|
|
|
type Item = T;
|
|
|
|
type IntoIter = IntoIter<T>;
|
|
|
|
|
|
|
|
/// Returns a consuming iterator over the possibly contained value.
|
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
///
|
|
|
|
/// ```
|
|
|
|
/// let x: Result<u32, &str> = Ok(5);
|
|
|
|
/// let v: Vec<u32> = x.into_iter().collect();
|
|
|
|
/// assert_eq!(v, [5]);
|
|
|
|
///
|
|
|
|
/// let x: Result<u32, &str> = Err("nothing!");
|
|
|
|
/// let v: Vec<u32> = x.into_iter().collect();
|
|
|
|
/// assert_eq!(v, []);
|
|
|
|
/// ```
|
|
|
|
#[inline]
|
|
|
|
fn into_iter(self) -> IntoIter<T> {
|
|
|
|
IntoIter { inner: self.ok() }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
// The Result Iterators
|
2014-08-19 15:45:28 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
/// An iterator over a reference to the `Ok` variant of a `Result`.
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub struct Iter<'a, T: 'a> { inner: Option<&'a T> }
|
2014-08-19 15:45:28 -05:00
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> Iterator for Iter<'a, T> {
|
|
|
|
type Item = &'a T;
|
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
fn next(&mut self) -> Option<&'a T> { self.inner.take() }
|
|
|
|
#[inline]
|
2015-02-15 09:24:47 -06:00
|
|
|
fn size_hint(&self) -> (usize, Option<usize>) {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
let n = if self.inner.is_some() {1} else {0};
|
|
|
|
(n, Some(n))
|
2014-08-19 15:45:28 -05:00
|
|
|
}
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> DoubleEndedIterator for Iter<'a, T> {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
#[inline]
|
|
|
|
fn next_back(&mut self) -> Option<&'a T> { self.inner.take() }
|
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> ExactSizeIterator for Iter<'a, T> {}
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
|
|
|
|
impl<'a, T> Clone for Iter<'a, T> {
|
|
|
|
fn clone(&self) -> Iter<'a, T> { Iter { inner: self.inner } }
|
|
|
|
}
|
|
|
|
|
|
|
|
/// An iterator over a mutable reference to the `Ok` variant of a `Result`.
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub struct IterMut<'a, T: 'a> { inner: Option<&'a mut T> }
|
2014-08-19 15:45:28 -05:00
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> Iterator for IterMut<'a, T> {
|
|
|
|
type Item = &'a mut T;
|
|
|
|
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
#[inline]
|
|
|
|
fn next(&mut self) -> Option<&'a mut T> { self.inner.take() }
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
2015-02-15 09:24:47 -06:00
|
|
|
fn size_hint(&self) -> (usize, Option<usize>) {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
let n = if self.inner.is_some() {1} else {0};
|
|
|
|
(n, Some(n))
|
2014-08-19 15:45:28 -05:00
|
|
|
}
|
|
|
|
}
|
2014-06-23 18:27:54 -05:00
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> DoubleEndedIterator for IterMut<'a, T> {
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
fn next_back(&mut self) -> Option<&'a mut T> { self.inner.take() }
|
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<'a, T> ExactSizeIterator for IterMut<'a, T> {}
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
|
|
|
|
/// An iterator over the value in a `Ok` variant of a `Result`.
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
pub struct IntoIter<T> { inner: Option<T> }
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<T> Iterator for IntoIter<T> {
|
|
|
|
type Item = T;
|
|
|
|
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
#[inline]
|
|
|
|
fn next(&mut self) -> Option<T> { self.inner.take() }
|
|
|
|
#[inline]
|
2015-02-15 09:24:47 -06:00
|
|
|
fn size_hint(&self) -> (usize, Option<usize>) {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
let n = if self.inner.is_some() {1} else {0};
|
|
|
|
(n, Some(n))
|
2014-06-23 18:27:54 -05:00
|
|
|
}
|
2014-08-19 15:45:28 -05:00
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<T> DoubleEndedIterator for IntoIter<T> {
|
std: Second pass stabilization of Result<T, E>
This commit, like the second pass of `Option`, largely just stablizes the
existing functionality after renaming a few iterators.
The specific actions taken were:
* The `Ok` and `Err` variants were marked `#[stable]` as the stability
inheritance was since removed.
* The `as_mut` method is now stable.
* The `map` method is now stable
* The `map_err` method is now stable
* The `iter`, `iter_mut`, and `into_iter` methods now returned structures named
after the method of iteration. The methods are also now all stable.
* The `and_then` method is now stable.
* The `or_else` method is now stable.
* The `unwrap` family of functions are now all stable: `unwrap_or`,
`unwrap_or_else`, `unwrap`, and `unwrap_err`.
There is a possible open extension to `Result::{and, and_then}` to make the
return type further generic over `FromError` (as proposed in #19078), but this
is a backwards compatible change due to the usage of default type parameters,
which makes the two functions safe to stabilize now regardless of the outcome of
that issue.
2014-12-17 14:10:13 -06:00
|
|
|
#[inline]
|
|
|
|
fn next_back(&mut self) -> Option<T> { self.inner.take() }
|
|
|
|
}
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<T> ExactSizeIterator for IntoIter<T> {}
|
2014-06-23 18:27:54 -05:00
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
2014-11-14 22:39:41 -06:00
|
|
|
// FromIterator
|
2014-08-19 15:45:28 -05:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-01-23 23:48:20 -06:00
|
|
|
#[stable(feature = "rust1", since = "1.0.0")]
|
2014-08-19 15:45:28 -05:00
|
|
|
impl<A, E, V: FromIterator<A>> FromIterator<Result<A, E>> for Result<V, E> {
|
|
|
|
/// Takes each element in the `Iterator`: if it is an `Err`, no further
|
|
|
|
/// elements are taken, and the `Err` is returned. Should no `Err` occur, a
|
|
|
|
/// container with the values of each `Result` is returned.
|
|
|
|
///
|
|
|
|
/// Here is an example which increments every integer in a vector,
|
|
|
|
/// checking for overflow:
|
|
|
|
///
|
2015-03-12 21:42:38 -05:00
|
|
|
/// ```
|
2015-02-15 09:24:47 -06:00
|
|
|
/// use std::u32;
|
2014-08-19 15:45:28 -05:00
|
|
|
///
|
2015-01-22 08:08:56 -06:00
|
|
|
/// let v = vec!(1, 2);
|
2015-02-15 09:24:47 -06:00
|
|
|
/// let res: Result<Vec<u32>, &'static str> = v.iter().map(|&x: &u32|
|
|
|
|
/// if x == u32::MAX { Err("Overflow!") }
|
2014-08-19 15:45:28 -05:00
|
|
|
/// else { Ok(x + 1) }
|
|
|
|
/// ).collect();
|
2015-01-22 08:08:56 -06:00
|
|
|
/// assert!(res == Ok(vec!(2, 3)));
|
2014-08-19 15:45:28 -05:00
|
|
|
/// ```
|
|
|
|
#[inline]
|
2015-02-18 12:06:21 -06:00
|
|
|
fn from_iter<I: IntoIterator<Item=Result<A, E>>>(iter: I) -> Result<V, E> {
|
2014-08-19 15:45:28 -05:00
|
|
|
// FIXME(#11084): This could be replaced with Iterator::scan when this
|
|
|
|
// performance bug is closed.
|
|
|
|
|
|
|
|
struct Adapter<Iter, E> {
|
|
|
|
iter: Iter,
|
|
|
|
err: Option<E>,
|
|
|
|
}
|
|
|
|
|
2014-12-29 15:18:41 -06:00
|
|
|
impl<T, E, Iter: Iterator<Item=Result<T, E>>> Iterator for Adapter<Iter, E> {
|
|
|
|
type Item = T;
|
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
#[inline]
|
|
|
|
fn next(&mut self) -> Option<T> {
|
|
|
|
match self.iter.next() {
|
|
|
|
Some(Ok(value)) => Some(value),
|
|
|
|
Some(Err(err)) => {
|
|
|
|
self.err = Some(err);
|
|
|
|
None
|
|
|
|
}
|
|
|
|
None => None,
|
2014-06-23 18:27:54 -05:00
|
|
|
}
|
2013-12-20 22:56:07 -06:00
|
|
|
}
|
2012-03-13 19:46:16 -05:00
|
|
|
}
|
2013-12-20 22:56:07 -06:00
|
|
|
|
2015-02-18 12:06:21 -06:00
|
|
|
let mut adapter = Adapter { iter: iter.into_iter(), err: None };
|
2014-08-19 15:45:28 -05:00
|
|
|
let v: V = FromIterator::from_iter(adapter.by_ref());
|
2013-12-20 22:56:07 -06:00
|
|
|
|
2014-08-19 15:45:28 -05:00
|
|
|
match adapter.err {
|
|
|
|
Some(err) => Err(err),
|
|
|
|
None => Ok(v),
|
|
|
|
}
|
2012-03-13 19:46:16 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-14 22:39:41 -06:00
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// FromIterator
|
|
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
2015-04-13 09:21:32 -05:00
|
|
|
/// Performs a fold operation over the result values from an iterator.
|
2013-08-03 18:59:24 -05:00
|
|
|
///
|
std: Replace map_vec, map_vec2, iter_vec2 in std::result
Replace these with three functions based on iterators: collect, fold,
and fold_. The mapping part is replaced by iterator .map(), so the part
that these functions do is to accumulate the final Result<,> value.
* `result::collect` gathers `Iterator<Result<V, U>>` to `Result<~[V], U>`
* `result::fold` folds `Iterator<Result<T, E>>` to `Result<V, E>`
* `result::fold_` folds `Iterator<Result<T, E>>` to `Result<(), E>`
2013-08-12 13:24:05 -05:00
|
|
|
/// If an `Err` is encountered, it is immediately returned.
|
|
|
|
/// Otherwise, the folded value is returned.
|
2013-06-18 16:45:18 -05:00
|
|
|
#[inline]
|
2015-06-09 13:18:03 -05:00
|
|
|
#[unstable(feature = "result_fold",
|
|
|
|
reason = "unclear if this function should exist")]
|
2015-06-10 20:04:49 -05:00
|
|
|
#[deprecated(since = "1.2.0",
|
|
|
|
reason = "has not seen enough usage to justify its position in \
|
|
|
|
the standard library")]
|
2013-11-18 23:15:42 -06:00
|
|
|
pub fn fold<T,
|
|
|
|
V,
|
|
|
|
E,
|
2014-12-02 11:47:07 -06:00
|
|
|
F: FnMut(V, T) -> V,
|
2014-12-29 15:18:41 -06:00
|
|
|
Iter: Iterator<Item=Result<T, E>>>(
|
2015-01-31 08:17:50 -06:00
|
|
|
iterator: Iter,
|
std: Replace map_vec, map_vec2, iter_vec2 in std::result
Replace these with three functions based on iterators: collect, fold,
and fold_. The mapping part is replaced by iterator .map(), so the part
that these functions do is to accumulate the final Result<,> value.
* `result::collect` gathers `Iterator<Result<V, U>>` to `Result<~[V], U>`
* `result::fold` folds `Iterator<Result<T, E>>` to `Result<V, E>`
* `result::fold_` folds `Iterator<Result<T, E>>` to `Result<(), E>`
2013-08-12 13:24:05 -05:00
|
|
|
mut init: V,
|
2014-12-02 11:47:07 -06:00
|
|
|
mut f: F)
|
2013-11-18 23:15:42 -06:00
|
|
|
-> Result<V, E> {
|
std: Replace map_vec, map_vec2, iter_vec2 in std::result
Replace these with three functions based on iterators: collect, fold,
and fold_. The mapping part is replaced by iterator .map(), so the part
that these functions do is to accumulate the final Result<,> value.
* `result::collect` gathers `Iterator<Result<V, U>>` to `Result<~[V], U>`
* `result::fold` folds `Iterator<Result<T, E>>` to `Result<V, E>`
* `result::fold_` folds `Iterator<Result<T, E>>` to `Result<(), E>`
2013-08-12 13:24:05 -05:00
|
|
|
for t in iterator {
|
|
|
|
match t {
|
|
|
|
Ok(v) => init = f(init, v),
|
|
|
|
Err(u) => return Err(u)
|
2012-03-13 19:46:16 -05:00
|
|
|
}
|
|
|
|
}
|
std: Replace map_vec, map_vec2, iter_vec2 in std::result
Replace these with three functions based on iterators: collect, fold,
and fold_. The mapping part is replaced by iterator .map(), so the part
that these functions do is to accumulate the final Result<,> value.
* `result::collect` gathers `Iterator<Result<V, U>>` to `Result<~[V], U>`
* `result::fold` folds `Iterator<Result<T, E>>` to `Result<V, E>`
* `result::fold_` folds `Iterator<Result<T, E>>` to `Result<(), E>`
2013-08-12 13:24:05 -05:00
|
|
|
Ok(init)
|
2012-03-13 19:46:16 -05:00
|
|
|
}
|