user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review fixes.

Browse source 
- `suggest_snippet` handling space between refs;
- Suggest message changing according to the number of refs that should
be removed.
This commit is contained in:
Yukio Siraichi 2018-03-13 01:06:04 -03:00
parent f44b945e0e
commit 97b66d2987
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc/traits/error_reporting.rs
View file

@ -883,6 +883,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
}
}
/// Whenever references are used by mistake, like `for (i, e) in &vec.iter().enumerate()`,
/// suggest removing these references until we reach a type that implements the trait.
fn suggest_remove_reference(&self,
obligation: &PredicateObligation<'tcx>,
err: &mut DiagnosticBuilder<'tcx>,
@ -896,16 +898,14 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
.take_while(|c| *c == '&')
.count();
let mut refs_remaining = refs_number;
let mut trait_type = trait_ref.self_ty();
let mut selcx = SelectionContext::new(self);
while refs_remaining > 0 {
for refs_remaining in 0..refs_number {
if let ty::TypeVariants::TyRef(_, ty::TypeAndMut{ ty: t_type, mutbl: _ }) =
trait_type.sty {
trait_type = t_type;
refs_remaining -= 1;
let substs = self.tcx.mk_substs_trait(trait_type, &[]);
let new_trait_ref = ty::TraitRef::new(trait_ref.def_id, substs);
@ -914,12 +914,16 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
new_trait_ref.to_predicate());
if selcx.evaluate_obligation(&new_obligation) {
let remove_refs = refs_remaining + 1;
let suggest_snippet = snippet.chars()
.skip(refs_number)
.filter(|c| !c.is_whitespace())
.skip(remove_refs)
.collect::<String>();
err.span_suggestion(span,
"consider removing `&`s like",
&format!("consider removing {} references `&`",
remove_refs),
format!("{}", suggest_snippet));
break;