Skip to content

Commit 4e437d6

Browse files
committed
fix to bypass #62696
I think that PR is a problem (#63145), but this makes the tests green for now.
1 parent 595c2e6 commit 4e437d6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/librustc/traits/specialize/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ pub(super) fn specialization_graph_provider(
310310
};
311311

312312
if let Some(overlap) = overlap {
313+
debug!("found conflicting implementations {:?}", overlap);
314+
313315
let msg = format!("conflicting implementations of trait `{}`{}:{}",
314316
overlap.trait_desc,
315317
overlap.self_desc.clone().map_or(

src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
#![feature(rustc_attrs)]
66

7-
trait MyTrait {}
7+
pub trait MyTrait {}
88
#[rustc_reservation_impl="this impl is reserved"]
99
impl MyTrait for () {}
1010

11-
trait OtherTrait {}
11+
pub trait OtherTrait {}
1212
impl OtherTrait for () {}
1313
impl<T: MyTrait> OtherTrait for T {}
1414
//~^ ERROR conflicting implementations

0 commit comments

Comments
 (0)