bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Show detailed expected/found types in error message when trait paths are the same

Browse source
This commit is contained in:
rhysd 2021-10-08 01:00:15 +09:00
parent ca8078d7b2
commit 7b9ddbdcf2
9 changed files with 87 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -2060,14 +2060,24 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
expected: exp_found.expected.print_only_trait_path(),
found: exp_found.found.print_only_trait_path(),
};
self.expected_found_str(pretty_exp_found)
match self.expected_found_str(pretty_exp_found) {
Some((expected, found)) if expected == found => {
self.expected_found_str(exp_found)
}
ret => ret,
}
}
infer::PolyTraitRefs(exp_found) => {
let pretty_exp_found = ty::error::ExpectedFound {
expected: exp_found.expected.print_only_trait_path(),
found: exp_found.found.print_only_trait_path(),
};
self.expected_found_str(pretty_exp_found)
match self.expected_found_str(pretty_exp_found) {
Some((expected, found)) if expected == found => {
self.expected_found_str(exp_found)
}
ret => ret,
}
}
}
}