Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

On type mismatch error highlight & when type matches #46349

Merged
merged 2 commits into from
Dec 2, 2017
Merged

On type mismatch error highlight & when type matches #46349

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677381a
On type mismatch error highlight `&` when type matches
estebank Nov 28, 2017
02808f1
Include lifetime on highlighted ref type mismatch
estebank Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions src/librustc/infer/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,20 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
fn cmp(&self, t1: Ty<'tcx>, t2: Ty<'tcx>)
-> (DiagnosticStyledString, DiagnosticStyledString)
{
fn equals<'tcx>(a: &Ty<'tcx>, b: &Ty<'tcx>) -> bool {
match (&a.sty, &b.sty) {
(a, b) if *a == *b => true,
(&ty::TyInt(_), &ty::TyInfer(ty::InferTy::IntVar(_))) |
(&ty::TyInfer(ty::InferTy::IntVar(_)), &ty::TyInt(_)) |
(&ty::TyInfer(ty::InferTy::IntVar(_)), &ty::TyInfer(ty::InferTy::IntVar(_))) |
(&ty::TyFloat(_), &ty::TyInfer(ty::InferTy::FloatVar(_))) |
(&ty::TyInfer(ty::InferTy::FloatVar(_)), &ty::TyFloat(_)) |
(&ty::TyInfer(ty::InferTy::FloatVar(_)),
&ty::TyInfer(ty::InferTy::FloatVar(_))) => true,
Copy link
Member

@mark-i-m mark-i-m Nov 29, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to do some sort of cannonical sorting here to get rid of duplicate cases?

EDIT: By "duplicate" I mean mirrored.

_ => false,
}
}

match (&t1.sty, &t2.sty) {
(&ty::TyAdt(def1, sub1), &ty::TyAdt(def2, sub2)) => {
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
Expand Down Expand Up @@ -672,6 +686,50 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
DiagnosticStyledString::highlighted(format!("{}", t2)))
}
}

// When finding T != &T, hightlight only the borrow
(&ty::TyRef(_, ref tnm1), _) if equals(&tnm1.ty, &t2) => {
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
values.0.push_highlighted(format!("&{}", if tnm1.mutbl == hir::MutMutable {
"mut "
} else {
""
}));
values.0.push_normal(format!("{}", tnm1.ty));
values.1.push_normal(format!("{}", t2));
values
}
(_, &ty::TyRef(_, ref tnm2)) if equals(&t1, &tnm2.ty) => {
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
values.1.push_highlighted(format!("&{}", if tnm2.mutbl == hir::MutMutable {
"mut "
} else {
""
}));
values.0.push_normal(format!("{}", t1));
values.1.push_normal(format!("{}", tnm2.ty));
values
}

// When encountering &T != &mut T, highlight only the borrow
(&ty::TyRef(_, ref tnm1), &ty::TyRef(_, ref tnm2)) if equals(&tnm1.ty, &tnm2.ty) => {
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
values.0.push_highlighted(format!("&{}", if tnm1.mutbl == hir::MutMutable {
"mut "
} else {
""
}));
values.1.push_highlighted(format!("&{}", if tnm2.mutbl == hir::MutMutable {
"mut "
} else {
""
}));

values.0.push_normal(format!("{}", tnm1.ty));
values.1.push_normal(format!("{}", tnm2.ty));
values
}

_ => {
if t1 == t2 {
// The two types are the same, elide and don't highlight.
Expand Down