Skip to content

Commit 0839a16

Browse files
committed
Auto merge of rust-lang#120558 - oli-obk:missing_impl_item_ice, r=estebank
Stop bailing out from compilation just because there were incoherent traits fixes rust-lang#120343 but also has a lot of "type annotations needed" fallout. Some are fixed in the second commit.
2 parents 420b5d8 + da24d52 commit 0839a16

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

core/src/primitive_docs.rs

-36
Original file line numberDiff line numberDiff line change
@@ -448,22 +448,6 @@ mod prim_unit {}
448448
#[doc(hidden)]
449449
impl () {}
450450

451-
// Fake impl that's only really used for docs.
452-
#[cfg(doc)]
453-
#[stable(feature = "rust1", since = "1.0.0")]
454-
impl Clone for () {
455-
fn clone(&self) -> Self {
456-
loop {}
457-
}
458-
}
459-
460-
// Fake impl that's only really used for docs.
461-
#[cfg(doc)]
462-
#[stable(feature = "rust1", since = "1.0.0")]
463-
impl Copy for () {
464-
// empty
465-
}
466-
467451
#[rustc_doc_primitive = "pointer"]
468452
#[doc(alias = "ptr")]
469453
#[doc(alias = "*")]
@@ -1690,23 +1674,3 @@ mod prim_fn {}
16901674
// See src/librustdoc/passes/collect_trait_impls.rs:collect_trait_impls
16911675
#[doc(hidden)]
16921676
impl<Ret, T> fn(T) -> Ret {}
1693-
1694-
// Fake impl that's only really used for docs.
1695-
#[cfg(doc)]
1696-
#[stable(feature = "rust1", since = "1.0.0")]
1697-
#[doc(fake_variadic)]
1698-
/// This trait is implemented on function pointers with any number of arguments.
1699-
impl<Ret, T> Clone for fn(T) -> Ret {
1700-
fn clone(&self) -> Self {
1701-
loop {}
1702-
}
1703-
}
1704-
1705-
// Fake impl that's only really used for docs.
1706-
#[cfg(doc)]
1707-
#[stable(feature = "rust1", since = "1.0.0")]
1708-
#[doc(fake_variadic)]
1709-
/// This trait is implemented on function pointers with any number of arguments.
1710-
impl<Ret, T> Copy for fn(T) -> Ret {
1711-
// empty
1712-
}

0 commit comments

Comments
 (0)