]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16664 : aturon/rust/stabilize-option-result, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 28 Aug 2014 23:56:20 +0000 (23:56 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 Aug 2014 23:56:20 +0000 (23:56 +0000)
Per API meeting

  https://github.com/rust-lang/meeting-minutes/blob/master/Meeting-API-review-2014-08-13.md

# Changes to `core::option`

Most of the module is marked as stable or unstable; most of the unstable items are awaiting resolution of conventions issues.

However, a few methods have been deprecated, either due to lack of use or redundancy:

* `take_unwrap`, `get_ref` and `get_mut_ref` (redundant, and we prefer for this functionality to go through an explicit .unwrap)
* `filtered` and `while`
* `mutate` and `mutate_or_set`
* `collect`: this functionality is being moved to a new `FromIterator` impl.

# Changes to `core::result`

Most of the module is marked as stable or unstable; most of the unstable items are awaiting resolution of conventions issues.

* `collect`: this functionality is being moved to a new `FromIterator` impl.
* `fold_` is deprecated due to lack of use
* Several methods found in `core::option` are added here, including `iter`, `as_slice`, and variants.

Due to deprecations, this is a:

[breaking-change]

14 files changed:
1  2 
src/libcollections/dlist.rs
src/libcollections/ringbuf.rs
src/libcollections/treemap.rs
src/libcore/cell.rs
src/libcore/iter.rs
src/libgreen/task.rs
src/libnative/task.rs
src/librustc/driver/driver.rs
src/librustdoc/clean/inline.rs
src/librustdoc/clean/mod.rs
src/librustdoc/html/render.rs
src/librustrt/task.rs
src/librustuv/timeout.rs
src/libsync/raw.rs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge