diff options
| author | Scott McMurray <scottmcm@users.noreply.github.com> | 2017-05-31 01:30:13 -0700 |
|---|---|---|
| committer | Scott McMurray <scottmcm@users.noreply.github.com> | 2017-05-31 01:30:13 -0700 |
| commit | 7a87469af7be24f6653ab59be0f1a544f4f3eb80 (patch) | |
| tree | 29a803ad1843f0ca9e43d815adbb7613ac54c7ce /src | |
| parent | ecde1e1d3b077f22f75ad34e12e35eef0b6c85f3 (diff) | |
| download | rust-7a87469af7be24f6653ab59be0f1a544f4f3eb80.tar.gz rust-7a87469af7be24f6653ab59be0f1a544f4f3eb80.zip | |
Give the `try_trait` feature its own tracking issue
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/unstable-book/src/library-features/try-trait.md | 4 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 12 | ||||
| -rw-r--r-- | src/libcore/result.rs | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/doc/unstable-book/src/library-features/try-trait.md b/src/doc/unstable-book/src/library-features/try-trait.md index f08929d4e3c..7289e95c2a0 100644 --- a/src/doc/unstable-book/src/library-features/try-trait.md +++ b/src/doc/unstable-book/src/library-features/try-trait.md @@ -1,7 +1,7 @@ # `try_trait` -The tracking issue for this feature is: [#31436] +The tracking issue for this feature is: [#42327] -[#31436]: https://github.com/rust-lang/rust/issues/31436 +[#42327]: https://github.com/rust-lang/rust/issues/42327 ------------------------ diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 912f3d4ff07..a1de8fe76e2 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -2988,13 +2988,13 @@ impl Try for _DummyErrorType { /// in terms of a success/failure dichotomy. This trait allows both /// extracting those success or failure values from an existing instance and /// creating a new instance from a success or failure value. -#[unstable(feature = "try_trait", issue = "31436")] +#[unstable(feature = "try_trait", issue = "42327")] pub trait Try { /// The type of this value when viewed as successful. - #[unstable(feature = "try_trait", issue = "31436")] + #[unstable(feature = "try_trait", issue = "42327")] type Ok; /// The type of this value when viewed as failed. - #[unstable(feature = "try_trait", issue = "31436")] + #[unstable(feature = "try_trait", issue = "42327")] type Error; /// Applies the "?" operator. A return of `Ok(t)` means that the @@ -3006,16 +3006,16 @@ pub trait Try { /// in the return type of the enclosing scope (which must itself implement /// `Try`). Specifically, the value `X::from_error(From::from(e))` /// is returned, where `X` is the return type of the enclosing function. - #[unstable(feature = "try_trait", issue = "31436")] + #[unstable(feature = "try_trait", issue = "42327")] fn into_result(self) -> Result<Self::Ok, Self::Error>; /// Wrap an error value to construct the composite result. For example, /// `Result::Err(x)` and `Result::from_error(x)` are equivalent. - #[unstable(feature = "try_trait", issue = "31436")] + #[unstable(feature = "try_trait", issue = "42327")] fn from_error(v: Self::Error) -> Self; /// Wrap an OK value to construct the composite result. For example, /// `Result::Ok(x)` and `Result::from_ok(x)` are equivalent. - #[unstable(feature = "try_trait", issue = "31436")] + #[unstable(feature = "try_trait", issue = "42327")] fn from_ok(v: Self::Ok) -> Self; } diff --git a/src/libcore/result.rs b/src/libcore/result.rs index a02c19f5f38..df7fff0df92 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -1110,7 +1110,7 @@ impl<A, E, V: FromIterator<A>> FromIterator<Result<A, E>> for Result<V, E> { } } -#[unstable(feature = "try_trait", issue = "31436")] +#[unstable(feature = "try_trait", issue = "42327")] impl<T,E> ops::Try for Result<T, E> { type Ok = T; type Error = E; |
