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

Fix error message on invalid field names for a struct variant #20084

Merged
merged 1 commit into from
Dec 23, 2014
+42 −10
Merged

Fix error message on invalid field names for a struct variant #20084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 24 additions & 10 deletions src/librustc_typeck/check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,7 +3419,8 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
substitutions: subst::Substs<'tcx>,
field_types: &[ty::field_ty],
ast_fields: &[ast::Field],
check_completeness: bool) {
check_completeness: bool,
enum_id_opt: Option<ast::DefId>) {
let tcx = fcx.ccx.tcx;

let mut class_field_map = FnvHashMap::new();
Expand All @@ -3438,13 +3439,24 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
match pair {
None => {
fcx.type_error_message(
field.ident.span,
|actual| {
format!("structure `{}` has no field named `{}`",
actual, token::get_ident(field.ident.node))
},
struct_ty,
None);
field.ident.span,
|actual| match enum_id_opt {
Some(enum_id) => {
let variant_type = ty::enum_variant_with_id(tcx,
enum_id,
class_id);
format!("struct variant `{}::{}` has no field named `{}`",
actual, variant_type.name.as_str(),
token::get_ident(field.ident.node))
}
None => {
Copy link
Contributor

Choose a reason for hiding this comment

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

it'd have been nice to have a test for this case 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.

Oh... it's true. I'll add it soon.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It seems that the case is already provided by the existing test cases(struct-fields-too-many.rs and issue-4736.rs), so I think it would not be necessary to add another one.

Copy link
Contributor

Choose a reason for hiding this comment

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

I know it's provided, but it's still nice to have it in the same issue-19922.rs file as a quick proof that this works for the other cases. Sorry, I should have phrased my previous comment better :)

format!("structure `{}` has no field named `{}`",
actual,
token::get_ident(field.ident.node))
}
},
struct_ty,
None);
error_happened = true;
}
Some((_, true)) => {
Expand Down Expand Up @@ -3525,7 +3537,8 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
struct_substs,
class_fields.as_slice(),
fields,
base_expr.is_none());
base_expr.is_none(),
None);
if ty::type_is_error(fcx.node_ty(id)) {
struct_type = ty::mk_err();
}
Expand Down Expand Up @@ -3567,7 +3580,8 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
substitutions,
variant_fields.as_slice(),
fields,
true);
true,
Some(enum_id));
fcx.write_ty(id, enum_type);
}

Expand Down
18 changes: 18 additions & 0 deletions src/test/compile-fail/issue-19922.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2014 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.

enum Homura {
Akemi { madoka: () }
}

fn main() {
let homura = Homura::Akemi { kaname: () };
//~^ ERROR struct variant `Homura::Akemi` has no field named `kaname`
}