mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only relevant parts of type paths highlighted in E0308 type mismatch error message

Browse Source
This commit is contained in:
Kevyn Grasso 2019-10-20 21:30:43 -04:00
parent fedefeca6d
commit 2337bbb8a4
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/librustc/infer/error_reporting/mod.rs
View File

@ -867,7 +867,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
/// Compares two given types, eliding parts that are the same between them and highlighting
/// relevant differences, and return two representation of those types for highlighted printing.
fn cmp(&self, t1: Ty<'tcx>, t2: Ty<'tcx>) -> (DiagnosticStyledString, DiagnosticStyledString) {
debug!("cmp(t1={}, t2={})", t1, t2);
debug!("cmp(t1={}, t1.kind={:?}, t2={}, t2.kind={:?})", t1, t1.kind, t2, t2.kind);
// helper functions
fn equals<'tcx>(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
@ -1056,12 +1056,47 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
return values;
}
// We couldn't find anything in common, highlight everything.
// let x: Bar<Qux> = y::<Foo<Zar>>();
(
DiagnosticStyledString::highlighted(t1.to_string()),
DiagnosticStyledString::highlighted(t2.to_string()),
)
// We can't find anything in common, highlight relevant part of type path.
// let x: foo::bar::Baz<Qux> = y:<foo::bar::Bar<Zar>>();
// foo::bar::Baz<Qux>
// foo::bar::Bar<Zar>
// -------- this part of the path is different
let t1_str = t1.to_string();
let t2_str = t2.to_string();
let min_len = t1_str.len().min(t2_str.len());
const SEPARATOR: &str = "::";
let separator_len = SEPARATOR.len();
let split_idx: usize =
t1_str.split(SEPARATOR)
.zip(t2_str.split(SEPARATOR))
.take_while(|(mod1_str, mod2_str)| mod1_str == mod2_str)
.map(|(mod_str, _)| mod_str.len() + separator_len)
.sum();
debug!("cmp: separator_len={}, split_idx={}, min_len={}",
separator_len, split_idx, min_len
);
if split_idx >= min_len {
// paths are identical, highlight everything
(
DiagnosticStyledString::highlighted(t1_str),
DiagnosticStyledString::highlighted(t2_str)
)
} else {
let (common, uniq1) = t1_str.split_at(split_idx);
let (_, uniq2) = t2_str.split_at(split_idx);
debug!("cmp: common={}, uniq1={}, uniq2={}", common, uniq1, uniq2);
values.0.push_normal(common);
values.0.push_highlighted(uniq1);
values.1.push_normal(common);
values.1.push_highlighted(uniq2);
values
}
}
}