diff options
| author | Lzu Tao <taolzu@gmail.com> | 2019-07-15 17:42:08 +0000 |
|---|---|---|
| committer | Lzu Tao <taolzu@gmail.com> | 2019-08-09 02:29:44 +0000 |
| commit | 90fa7901b98367d04857cb96366b2eedf70693e2 (patch) | |
| tree | edea7791ab18e5f905b2dbe0aca47f88dc58b66b /src | |
| parent | fd7ac6b17ef98f63438f59edca40562c400d4128 (diff) | |
| download | rust-90fa7901b98367d04857cb96366b2eedf70693e2.tar.gz rust-90fa7901b98367d04857cb96366b2eedf70693e2.zip | |
Postpone deprecating try! until 1.39.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/macros.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index ba641f7dc5c..aa661078e71 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -300,9 +300,9 @@ macro_rules! debug_assert_ne { /// Ok(()) /// } /// ``` -#[rustc_deprecated(since = "1.38.0", reason = "use the `?` operator instead")] #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] +#[rustc_deprecated(since = "1.39.0", reason = "use the `?` operator instead")] #[doc(alias = "?")] macro_rules! r#try { ($expr:expr) => (match $expr { diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 34956fc8394..54abf72d307 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -331,7 +331,8 @@ use prelude::v1::*; pub use core::{assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::{unreachable, unimplemented, write, writeln, todo}; -#[allow(deprecated)] +// FIXME: change this to `#[allow(deprecated)]` when we update nightly compiler. +#[allow(deprecated_in_future)] #[stable(feature = "rust1", since = "1.0.0")] pub use core::r#try; |