Rollup merge of #59835 - lzutao:nonzero-signed, r=Mark-Simulacrum

Re-export NonZero signed variant in std Closes #59834 .
2019-04-14 00:23:39 +02:00 · 2019-04-14 00:23:39 +02:00 · 449697b7ff
commit 449697b7ff
parent 715875268a 404df312d3
2 changed files with 3 additions and 1 deletions
--- 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("")?;
   |
   = 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`