diff options
| author | bors <bors@rust-lang.org> | 2019-08-09 12:14:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-09 12:14:57 +0000 |
| commit | 534b42394d743511db1335d5ed08d507ab7c6e73 (patch) | |
| tree | cc047310c6dacf2211ab80a7087e70a0198d13ee /src/libstd | |
| parent | 813a3a5d4b2be4e2101faa73a067da02a704a598 (diff) | |
| parent | 4e3c209b67c1afe800564fa5ac884e06fde8f378 (diff) | |
| download | rust-534b42394d743511db1335d5ed08d507ab7c6e73.tar.gz rust-534b42394d743511db1335d5ed08d507ab7c6e73.zip | |
Auto merge of #63408 - Centril:rollup-skqrez3, r=Centril
Rollup of 7 pull requests Successful merges: - #62672 (Deprecate `try!` macro) - #62950 (Check rustbook links on all platforms when running locally) - #63114 (Remove gensym in format_args) - #63397 (Add tests for some ICEs) - #63403 (Improve test output) - #63404 (enable flt2dec tests in Miri) - #63407 (reduce some test sizes in Miri) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index cfee49a7b55..54abf72d307 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -330,7 +330,11 @@ use prelude::v1::*; #[stable(feature = "rust1", since = "1.0.0")] 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, r#try, todo}; +pub use core::{unreachable, unimplemented, write, writeln, todo}; +// 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; #[allow(unused_imports)] // macros from `alloc` are not used on all platforms #[macro_use] |