Skip to content

Commit 90fa790

Browse files
committed
Postpone deprecating try! until 1.39.0
1 parent fd7ac6b commit 90fa790

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libcore/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,9 @@ macro_rules! debug_assert_ne {
300300
/// Ok(())
301301
/// }
302302
/// ```
303-
#[rustc_deprecated(since = "1.38.0", reason = "use the `?` operator instead")]
304303
#[macro_export]
305304
#[stable(feature = "rust1", since = "1.0.0")]
305+
#[rustc_deprecated(since = "1.39.0", reason = "use the `?` operator instead")]
306306
#[doc(alias = "?")]
307307
macro_rules! r#try {
308308
($expr:expr) => (match $expr {

src/libstd/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,8 @@ use prelude::v1::*;
331331
pub use core::{assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne};
332332
#[stable(feature = "rust1", since = "1.0.0")]
333333
pub use core::{unreachable, unimplemented, write, writeln, todo};
334-
#[allow(deprecated)]
334+
// FIXME: change this to `#[allow(deprecated)]` when we update nightly compiler.
335+
#[allow(deprecated_in_future)]
335336
#[stable(feature = "rust1", since = "1.0.0")]
336337
pub use core::r#try;
337338

0 commit comments

Comments
 (0)