Skip to content

Commit

Permalink
(fix) conflicting negative impl marker and add tests
Browse files Browse the repository at this point in the history
  • Loading branch information
heiseish committed Sep 14, 2024
1 parent 842d6fc commit b0db3a7
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ pub(crate) fn to_pretty_impl_header(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Opti

write!(
w,
" {} for {}",
" {}{} for {}",
tcx.impl_polarity(impl_def_id).as_str(),
trait_ref.print_only_trait_path(),
tcx.type_of(impl_def_id).instantiate_identity()
)
Expand Down
11 changes: 11 additions & 0 deletions compiler/rustc_type_ir/src/predicate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,17 @@ impl fmt::Display for ImplPolarity {
}
}

impl ImplPolarity {
/// The polarity marker in front of the impl trait ref if applicable.
pub fn as_str(self) -> &'static str {
match self {
Self::Positive => "",
Self::Negative => "!",
Self::Reservation => "",
}
}
}

/// Polarity for a trait predicate. May either be negative or positive.
/// Distinguished from [`ImplPolarity`] since we never compute goals with
/// "reservation" level.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#![feature(negative_impls)]
//@ edition: 2021
// Test to ensure we are printing the polarity of the impl trait ref
// when printing out conflicting trait impls

struct MyType;

impl !Clone for &mut MyType {}
//~^ ERROR conflicting implementations of trait `Clone` for type `&mut MyType`
fn main() {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error[E0119]: conflicting implementations of trait `Clone` for type `&mut MyType`
--> $DIR/coherence-conflicting-repeated-negative-trait-impl-70849.rs:8:1
|
LL | impl !Clone for &mut MyType {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: conflicting implementation in crate `core`:
- impl<T> !Clone for &mut T
where T: ?Sized;

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0119`.

0 comments on commit b0db3a7

Please sign in to comment.