fix to bypass #62696

I think that PR is a problem (#63145), but this makes the tests green for now.
rust-lang · Aug 3, 2019 · 4e437d6 · 4e437d6
1 parent 595c2e6
commit 4e437d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/librustc/traits/specialize/mod.rs b/src/librustc/traits/specialize/mod.rs
@@ -310,6 +310,8 @@ pub(super) fn specialization_graph_provider(
             };
 
             if let Some(overlap) = overlap {
+                debug!("found conflicting implementations {:?}", overlap);
+
                 let msg = format!("conflicting implementations of trait `{}`{}:{}",
                     overlap.trait_desc,
                     overlap.self_desc.clone().map_or(

diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs b/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs
@@ -4,11 +4,11 @@
 
 #![feature(rustc_attrs)]
 
-trait MyTrait {}
+pub trait MyTrait {}
 #[rustc_reservation_impl="this impl is reserved"]
 impl MyTrait for () {}
 
-trait OtherTrait {}
+pub trait OtherTrait {}
 impl OtherTrait for () {}
 impl<T: MyTrait> OtherTrait for T {}
 //~^ ERROR conflicting implementations