about summary refs log tree commit diff
path: root/compiler/rustc_trait_selection/src
diff options
context:
space:
mode:
authorStuart Cook <Zalathar@users.noreply.github.com>2024-09-14 20:22:41 +1000
committerGitHub <noreply@github.com>2024-09-14 20:22:41 +1000
commit517e7ce37f3d5acae0eaa7e50bc76c291fb91e59 (patch)
treec13e02da3d3e0bab9fa9b6a500f94277e0d77fff /compiler/rustc_trait_selection/src
parente2f17e66ed9b34e5391ac3a813e7453664b2525c (diff)
parentb0db3a7bedc03d054834b675c417b988d7dc676f (diff)
downloadrust-517e7ce37f3d5acae0eaa7e50bc76c291fb91e59.tar.gz
rust-517e7ce37f3d5acae0eaa7e50bc76c291fb91e59.zip
Rollup merge of #130311 - heiseish:issue-70849-fix, r=fmease
(fix) conflicting negative impl marker

## Context

This MR fixes the error message for conflicting negative trait impls by adding the corresponding the polarity marker to the trait name.

## Issues

- closes #70849

r​? `@fmease`
Diffstat (limited to 'compiler/rustc_trait_selection/src')
-rw-r--r--compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs
index 9aa6d1f3d46..752ef729113 100644
--- a/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs
+++ b/compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs
@@ -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()
     )