diff options
| author | bors <bors@rust-lang.org> | 2019-04-10 18:44:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-10 18:44:27 +0000 |
| commit | 91856ed52c58aa5ba66a015354d1cc69e9779bdf (patch) | |
| tree | 4fc556da55164e5750f30c59f49998f6c0d4bd68 | |
| parent | a7af34a050b3e8c210abbfb51c1e860ad6e3a64a (diff) | |
| parent | c19ca84699a05cb834021fcfe44e3ee5ba3de751 (diff) | |
| download | rust-91856ed52c58aa5ba66a015354d1cc69e9779bdf.tar.gz rust-91856ed52c58aa5ba66a015354d1cc69e9779bdf.zip | |
Auto merge of #59843 - pietroalbini:stable-extras, r=Mark-Simulacrum 1.34.0
[stable] Cherry-pick stdlib fix Cherry-picked: * #59835: Re-export NonZero signed variant in std r? @Mark-Simulacrum cc https://github.com/rust-lang/rust/issues/59834 @rust-lang/release
| -rw-r--r-- | src/libstd/num.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/try-block/try-block-bad-type.stderr | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libstd/num.rs b/src/libstd/num.rs index c80b9a56704..dcdaa84c897 100644 --- a/src/libstd/num.rs +++ b/src/libstd/num.rs @@ -13,6 +13,8 @@ pub use core::num::Wrapping; #[stable(feature = "nonzero", since = "1.28.0")] pub use core::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU128, NonZeroUsize}; +#[stable(feature = "signed_nonzero", since = "1.34.0")] +pub use core::num::{NonZeroI8, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI128, NonZeroIsize}; #[cfg(test)] use fmt; #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem}; diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/src/test/ui/try-block/try-block-bad-type.stderr index df8e646280c..da218f63cb5 100644 --- a/src/test/ui/try-block/try-block-bad-type.stderr +++ b/src/test/ui/try-block/try-block-bad-type.stderr @@ -6,9 +6,9 @@ LL | Err("")?; //~ ERROR the trait bound `i32: std::convert::From<&str>` | = help: the following implementations were found: <i32 as std::convert::From<bool>> - <i32 as std::convert::From<core::num::NonZeroI32>> <i32 as std::convert::From<i16>> <i32 as std::convert::From<i8>> + <i32 as std::convert::From<std::num::NonZeroI32>> and 2 others = note: required by `std::convert::From::from` |