diff options
| author | bors <bors@rust-lang.org> | 2014-11-25 09:21:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-25 09:21:45 +0000 |
| commit | f6cb58caeedf509cc80dd376bbb2541a0446046b (patch) | |
| tree | 342842df92d03e14065608b8bef510e7b4980b05 /src/libstd/task.rs | |
| parent | 0c1d853fba0068f9fd34b43a565ded01b199506c (diff) | |
| parent | f1f6c1286f24f6f762a9b195ac678b55d20c9a9b (diff) | |
| download | rust-f6cb58caeedf509cc80dd376bbb2541a0446046b.tar.gz rust-f6cb58caeedf509cc80dd376bbb2541a0446046b.zip | |
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
Diffstat (limited to 'src/libstd/task.rs')
| -rw-r--r-- | src/libstd/task.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/task.rs b/src/libstd/task.rs index 4f5f47e980c..c852b4efbd8 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -197,7 +197,7 @@ impl TaskBuilder { /// completes or panics. Equivalent to `.try_future(f).unwrap()`. #[unstable = "Error type may change."] pub fn try<T:Send>(self, f: proc():Send -> T) -> Result<T, Box<Any + Send>> { - self.try_future(f).unwrap() + self.try_future(f).into_inner() } } |