about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-04-14 00:23:39 +0200
committerGitHub <noreply@github.com>2019-04-14 00:23:39 +0200
commit449697b7ff380206dd7eb758651b146da4b45fff (patch)
treec9f86fac6434445b9aa39abdabc99820123c2759 /src/test/ui
parent715875268a5dbe3787a5f1f68bb66cec302a0e68 (diff)
parent404df312d304c4abeb583d55223ac6c2f1a768ae (diff)
downloadrust-449697b7ff380206dd7eb758651b146da4b45fff.tar.gz
rust-449697b7ff380206dd7eb758651b146da4b45fff.zip
Rollup merge of #59835 - lzutao:nonzero-signed, r=Mark-Simulacrum
Re-export NonZero signed variant in std

Closes  #59834 .
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/try-block/try-block-bad-type.stderr2
1 files changed, 1 insertions, 1 deletions
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 6687bd9d9e1..07e7149793c 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("")?;
    |
    = 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`