Revert "Rollup merge of #62696 - chocol4te:fix_#62194, r=estebank"
This reverts commit df21a6f040a7011d509769a61ac7af9502636b33, reversing changes made to cc16d0486933e02237190366de2eb43df2215c11.
This commit is contained in:
parent
d7270712cb
commit
95f29aa81b
@ -366,14 +366,9 @@ pub(super) fn specialization_graph_provider(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let access_levels = tcx.privacy_access_levels(impl_def_id.krate);
|
|
||||||
if let Some(id) = tcx.hir().as_local_hir_id(impl_def_id) {
|
|
||||||
if access_levels.is_exported(id) || access_levels.is_public(id) {
|
|
||||||
for cause in &overlap.intercrate_ambiguity_causes {
|
for cause in &overlap.intercrate_ambiguity_causes {
|
||||||
cause.add_intercrate_ambiguity_hint(&mut err);
|
cause.add_intercrate_ambiguity_hint(&mut err);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if overlap.involves_placeholder {
|
if overlap.involves_placeholder {
|
||||||
coherence::add_placeholder_note(&mut err);
|
coherence::add_placeholder_note(&mut err);
|
||||||
|
@ -5,6 +5,8 @@ LL | impl<T> Foo for T where T: Remote {}
|
|||||||
| --------------------------------- first implementation here
|
| --------------------------------- first implementation here
|
||||||
LL | impl Foo for i16 {}
|
LL | impl Foo for i16 {}
|
||||||
| ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
|
| ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -5,6 +5,8 @@ LL | impl<T> Foo for T where T: Remote {}
|
|||||||
| --------------------------------- first implementation here
|
| --------------------------------- first implementation here
|
||||||
LL | impl Foo for i16 {}
|
LL | impl Foo for i16 {}
|
||||||
| ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
|
| ^^^^^^^^^^^^^^^^ conflicting implementation for `i16`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `coherence_lib::Remote` for type `i16` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
|
LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
|
LL | impl MyTrait for lib::MyFundamentalStruct<(MyType,)> { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyFundamentalStruct<(MyType,)>`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyFundamentalStruct<(MyType,)>` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for lib::MyStruct<MyType> { }
|
LL | impl MyTrait for lib::MyStruct<MyType> { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for lib::MyStruct<MyType> { }
|
LL | impl MyTrait for lib::MyStruct<MyType> { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `lib::MyStruct<MyType>`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `lib::MyStruct<MyType>` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for (MyType,) { }
|
LL | impl MyTrait for (MyType,) { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | impl<T: lib::MyCopy> MyTrait for T { }
|
|||||||
...
|
...
|
||||||
LL | impl MyTrait for (MyType,) { }
|
LL | impl MyTrait for (MyType,) { }
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(MyType,)`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `lib::MyCopy` for type `(MyType,)` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -6,6 +6,8 @@ LL | #[derive(Clone)]
|
|||||||
...
|
...
|
||||||
LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
|
LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
|
||||||
| ------------------------------------------- first implementation here
|
| ------------------------------------------- first implementation here
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `std::clone::Clone` for type `[_]` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
@ -10,6 +10,8 @@ LL | | }
|
|||||||
LL |
|
LL |
|
||||||
LL | impl IntoPyDictPointer for ()
|
LL | impl IntoPyDictPointer for ()
|
||||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()`
|
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `()`
|
||||||
|
|
|
||||||
|
= note: upstream crates may add new impl of trait `std::iter::Iterator` for type `()` in future versions
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: aborting due to previous error
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user