diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-14 10:34:23 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-14 11:24:49 -0800 |
| commit | 1fbca8824a6b6018191b7ee998d2c97f30c481d7 (patch) | |
| tree | 50d241ae939dda14ee2a0eaf07c3d6c46b302924 /src/librustc_driver | |
| parent | 444fa1b7cffcd99ca5b8abb51acf979f06a25899 (diff) | |
| download | rust-1fbca8824a6b6018191b7ee998d2c97f30c481d7.tar.gz rust-1fbca8824a6b6018191b7ee998d2c97f30c481d7.zip | |
std: Fully stabilize Option<T>
This commit takes a second pass through the `std::option` module to fully stabilize any lingering methods inside of it. These items were made stable as-is * Some * None * as_mut * expect * unwrap * unwrap_or * unwrap_or_else * map * map_or * map_or_else * and_then * or_else * unwrap_or_default * Default implementation * FromIterator implementation * Copy implementation These items were made stable with modifications * iter - now returns a struct called Iter * iter_mut - now returns a struct called IterMut * into_iter - now returns a struct called IntoIter, Clone is never implemented This is a breaking change due to the modifications to the names of the iterator types returned. Code referencing the old names should updated to referencing the newer names instead. This is also a breaking change due to the fact that `IntoIter` no longer implements the `Clone` trait. These items were explicitly not stabilized * as_slice - waiting on indexing conventions * as_mut_slice - waiting on conventions with as_slice as well * cloned - the API was still just recently added * ok_or - API remains experimental * ok_or_else - API remains experimental [breaking-change]
Diffstat (limited to 'src/librustc_driver')
| -rw-r--r-- | src/librustc_driver/pretty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs index 7ec05b6a030..57004d71c75 100644 --- a/src/librustc_driver/pretty.rs +++ b/src/librustc_driver/pretty.rs @@ -325,7 +325,7 @@ impl FromStr for UserIdentifiedItem { } enum NodesMatchingUII<'a, 'ast: 'a> { - NodesMatchingDirect(option::Item<ast::NodeId>), + NodesMatchingDirect(option::IntoIter<ast::NodeId>), NodesMatchingSuffix(ast_map::NodesMatchingSuffix<'a, 'ast, String>), } |
