]> git.lizzy.rs Git - rust.git/commit
auto merge of #19149 : alexcrichton/rust/issue-19091, r=aturon
authorbors <bors@rust-lang.org>
Tue, 25 Nov 2014 09:21:45 +0000 (09:21 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Nov 2014 09:21:45 +0000 (09:21 +0000)
commitf6cb58caeedf509cc80dd376bbb2541a0446046b
tree342842df92d03e14065608b8bef510e7b4980b05
parent0c1d853fba0068f9fd34b43a565ded01b199506c
parentf1f6c1286f24f6f762a9b195ac678b55d20c9a9b
auto merge of #19149 : alexcrichton/rust/issue-19091, r=aturon

This change applies the conventions to unwrap listed in [RFC 430][rfc] to rename
non-failing `unwrap` methods to `into_inner`. This is a breaking change, but all
`unwrap` methods are retained as `#[deprecated]` for the near future. To update
code rename `unwrap` method calls to `into_inner`.

[rfc]: https://github.com/rust-lang/rfcs/pull/430
[breaking-change]

cc #19091
src/libstd/sync/future.rs