Skip to content

Commit e91f3f6

Browse files
committed
Update error E0118 to new format
Fixes #35251 Also changes the span of the error to the span of the type as suggested in the bonus section of #35251
1 parent ac10b5f commit e91f3f6

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/librustc_typeck/coherence/orphan.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'cx, 'tcx> OrphanChecker<'cx, 'tcx> {
6666
fn check_item(&self, item: &hir::Item) {
6767
let def_id = self.tcx.map.local_def_id(item.id);
6868
match item.node {
69-
hir::ItemImpl(_, _, _, None, _, _) => {
69+
hir::ItemImpl(_, _, _, None, ref ty, _) => {
7070
// For inherent impls, self type must be a nominal type
7171
// defined in this crate.
7272
debug!("coherence2::orphan check: inherent impl {}",
@@ -209,11 +209,11 @@ impl<'cx, 'tcx> OrphanChecker<'cx, 'tcx> {
209209
return;
210210
}
211211
_ => {
212-
struct_span_err!(self.tcx.sess, item.span, E0118,
212+
struct_span_err!(self.tcx.sess, ty.span, E0118,
213213
"no base type found for inherent implementation")
214-
.span_help(item.span,
215-
"either implement a trait on it or create a newtype to wrap it \
216-
instead")
214+
.span_label(ty.span, &format!("impl requires a base type"))
215+
.note(&format!("either implement a trait on it or create a newtype \
216+
to wrap it instead"))
217217
.emit();
218218
return;
219219
}

src/test/compile-fail/E0118.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
// except according to those terms.
1010

1111
impl (u8, u8) { //~ ERROR E0118
12+
//~^ NOTE impl requires a base type
13+
//~| NOTE either implement a trait on it or create a newtype to wrap it instead
1214
fn get_state(&self) -> String {
1315
String::new()
1416
}

0 commit comments

Comments
 (0)