Skip to content

librustc: hint close matches on accessing nonexisting fields #21187

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.

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

Merged
merged 1 commit into from
Jan 22, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 41 additions & 1 deletion src/librustc_typeck/check/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
Expand Down Expand Up @@ -108,6 +108,7 @@ use lint;
use util::common::{block_query, indenter, loop_query};
use util::ppaux::{self, Repr};
use util::nodemap::{DefIdMap, FnvHashMap, NodeMap};
use util::lev_distance::lev_distance;

use std::cell::{Cell, Ref, RefCell};
use std::mem::replace;
Expand Down Expand Up @@ -3074,11 +3075,43 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
actual)
},
expr_t, None);
if let Some(t) = ty::ty_to_def_id(expr_t) {
suggest_field_names(t, field, tcx, vec![]);
}
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a test for this error message as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, allthough the test is not (yet) useful since it's ignored: #21195

}

fcx.write_error(expr.id);
}

// displays hints about the closest matches in field names
fn suggest_field_names<'tcx>(id : DefId,
field : &ast::SpannedIdent,
tcx : &ty::ctxt<'tcx>,
skip : Vec<&str>) {
let ident = token::get_ident(field.node);
let name = ident.get();
// only find fits with at least one matching letter
let mut best_dist = name.len();
let mut best = None;
let fields = ty::lookup_struct_fields(tcx, id);
for elem in fields.iter() {
let n = elem.name.as_str();
// ignore already set fields
if skip.iter().any(|&x| x == n) {
continue;
}
let dist = lev_distance(n, name);
if dist < best_dist {
best = Some(n);
best_dist = dist;
}
}
if let Some(n) = best {
tcx.sess.span_help(field.span,
format!("did you mean `{}`?", n).as_slice());
}
}

// Check tuple index expressions
fn check_tup_field(fcx: &FnCtxt,
expr: &ast::Expr,
Expand Down Expand Up @@ -3186,6 +3219,13 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
},
struct_ty,
None);
// prevent all specified fields from being suggested
let skip_fields = ast_fields.iter().map(|ref x| x.ident.node.name.as_str());
let actual_id = match enum_id_opt {
Some(_) => class_id,
None => ty::ty_to_def_id(struct_ty).unwrap()
};
suggest_field_names(actual_id, &field.ident, tcx, skip_fields.collect());
error_happened = true;
}
Some((_, true)) => {
Expand Down
24 changes: 24 additions & 0 deletions src/test/compile-fail/struct-fields-hints-no-dupe.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct A {
foo : i32,
car : i32,
barr : i32
}

fn main() {
let a = A {
foo : 5,
bar : 42,//~ ERROR structure `A` has no field named `bar`
//~^ HELP did you mean `barr`?
car : 9,
};
}
23 changes: 23 additions & 0 deletions src/test/compile-fail/struct-fields-hints.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct A {
foo : i32,
car : i32,
barr : i32
}

fn main() {
let a = A {
foo : 5,
bar : 42,//~ ERROR structure `A` has no field named `bar`
//~^ HELP did you mean `car`?
};
}
24 changes: 24 additions & 0 deletions src/test/compile-fail/struct-fields-typo.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

struct BuildData {
foo: isize,
bar: f32
}

fn main() {
let foo = BuildData {
foo: 0,
bar: 0.5,
};
let x = foo.baa;//~ ERROR attempted access of field `baa` on type `BuildData`
//~^ HELP did you mean `bar`?
println!("{}", x);
}