about summary refs log tree commit diff
path: root/tests/ui/traits
diff options
context:
space:
mode:
authorNilstrieb <48135649+Nilstrieb@users.noreply.github.com>2024-02-20 15:13:52 +0100
committerGitHub <noreply@github.com>2024-02-20 15:13:52 +0100
commitf6b4080592920e2148dc853bdb07b08a3fd8dddb (patch)
tree6eda974e2da9fd98ff0c543b5343b9bbf33eb6bf /tests/ui/traits
parent4ff6bb51e24c93c5ad677f4c312104ce0844853b (diff)
parentf12d248a6abeef2a1f8dc28f09344c8cba13d663 (diff)
downloadrust-f6b4080592920e2148dc853bdb07b08a3fd8dddb.tar.gz
rust-f6b4080592920e2148dc853bdb07b08a3fd8dddb.zip
Rollup merge of #121241 - reitermarkus:generic-nonzero-traits, r=dtolnay
Implement `NonZero` traits generically.

Tracking issue: https://github.com/rust-lang/rust/issues/120257

r? ````@dtolnay````
Diffstat (limited to 'tests/ui/traits')
-rw-r--r--tests/ui/traits/issue-77982.stderr1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/ui/traits/issue-77982.stderr b/tests/ui/traits/issue-77982.stderr
index bffad037fba..5be8d2f4b32 100644
--- a/tests/ui/traits/issue-77982.stderr
+++ b/tests/ui/traits/issue-77982.stderr
@@ -46,7 +46,6 @@ LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect(
    = note: multiple `impl`s satisfying `u32: From<_>` found in the `core` crate:
            - impl From<Char> for u32;
            - impl From<Ipv4Addr> for u32;
-           - impl From<NonZero<u32>> for u32;
            - impl From<bool> for u32;
            - impl From<char> for u32;
            - impl From<u16> for u32;