OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use RHS's struct def ID for error messages in pattern matching

Browse Source 
Fixes #14541
This commit is contained in:
Jakub Wieczorek 2014-05-30 17:38:15 +02:00
parent faa7ba75a7
commit 80e84e0001
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc/middle/typeck/check/_match.rs
View File

@ -298,9 +298,8 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: &ast::Pat, path: &ast::Path,
/// `etc` is true if the pattern said '...' and false otherwise.
pub fn check_struct_pat_fields(pcx: &pat_ctxt,
span: Span,
path: &ast::Path,
fields: &[ast::FieldPat],
class_fields: Vec<ty::field_ty> ,
class_fields: Vec<ty::field_ty>,
class_id: ast::DefId,
substitutions: &ty::substs,
etc: bool) {
@ -333,13 +332,12 @@ pub fn check_struct_pat_fields(pcx: &pat_ctxt,
found_fields.insert(index);
}
None => {
let name = pprust::path_to_str(path);
// Check the pattern anyway, so that attempts to look
// up its type won't fail
check_pat(pcx, field.pat, ty::mk_err());
tcx.sess.span_err(span,
format!("struct `{}` does not have a field named `{}`",
name,
ty::item_path_str(tcx, class_id),
token::get_ident(field.ident)).as_slice());
}
}
@ -390,7 +388,7 @@ pub fn check_struct_pat(pcx: &pat_ctxt, pat_id: ast::NodeId, span: Span,
}
}
check_struct_pat_fields(pcx, span, path, fields, class_fields, struct_id,
check_struct_pat_fields(pcx, span, fields, class_fields, struct_id,
substitutions, etc);
}
@ -413,7 +411,7 @@ pub fn check_struct_like_enum_variant_pat(pcx: &pat_ctxt,
// Get the struct fields from this struct-like enum variant.
let class_fields = ty::lookup_struct_fields(tcx, variant_id);
check_struct_pat_fields(pcx, span, path, fields, class_fields,
check_struct_pat_fields(pcx, span, fields, class_fields,
variant_id, substitutions, etc);
}
Some(&ast::DefStruct(..)) | Some(&ast::DefVariant(..)) => {

20
src/test/compile-fail/issue-14541.rs Normal file
View File

@ -0,0 +1,20 @@
// 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.
struct vec2 { y: f32 }
struct vec3 { y: f32, z: f32 }
fn make(v: vec2) {
let vec3 { y: _, z: _ } = v;
//~^ ERROR mismatched types: expected `vec2` but found `vec3`
//~^^ ERROR struct `vec2` does not have a field named `z`
}
fn main() { }