commit
7783e80d98
|
@ -143,5 +143,6 @@ register_diagnostics!(
|
|||
E0164,
|
||||
E0165,
|
||||
E0166,
|
||||
E0167
|
||||
E0167,
|
||||
E0168
|
||||
)
|
||||
|
|
|
@ -297,22 +297,38 @@ pub fn check_pat_struct(pcx: &pat_ctxt, pat: &ast::Pat,
|
|||
let tcx = pcx.fcx.ccx.tcx;
|
||||
|
||||
let def = tcx.def_map.borrow()[pat.id].clone();
|
||||
let def_type = ty::lookup_item_type(tcx, def.def_id());
|
||||
let (enum_def_id, variant_def_id) = match ty::get(def_type.ty).sty {
|
||||
ty::ty_struct(struct_def_id, _) =>
|
||||
(struct_def_id, struct_def_id),
|
||||
ty::ty_enum(enum_def_id, _) if def == def::DefVariant(enum_def_id, def.def_id(), true) =>
|
||||
(enum_def_id, def.def_id()),
|
||||
_ => {
|
||||
let (enum_def_id, variant_def_id) = match def {
|
||||
def::DefTrait(_) => {
|
||||
let name = pprust::path_to_string(path);
|
||||
span_err!(tcx.sess, pat.span, E0163,
|
||||
"`{}` does not name a struct or a struct variant", name);
|
||||
span_err!(tcx.sess, pat.span, E0168,
|
||||
"use of trait `{}` in a struct pattern", name);
|
||||
fcx.write_error(pat.id);
|
||||
|
||||
for field in fields.iter() {
|
||||
check_pat(pcx, &*field.node.pat, ty::mk_err());
|
||||
}
|
||||
return;
|
||||
},
|
||||
_ => {
|
||||
let def_type = ty::lookup_item_type(tcx, def.def_id());
|
||||
match ty::get(def_type.ty).sty {
|
||||
ty::ty_struct(struct_def_id, _) =>
|
||||
(struct_def_id, struct_def_id),
|
||||
ty::ty_enum(enum_def_id, _)
|
||||
if def == def::DefVariant(enum_def_id, def.def_id(), true) =>
|
||||
(enum_def_id, def.def_id()),
|
||||
_ => {
|
||||
let name = pprust::path_to_string(path);
|
||||
span_err!(tcx.sess, pat.span, E0163,
|
||||
"`{}` does not name a struct or a struct variant", name);
|
||||
fcx.write_error(pat.id);
|
||||
|
||||
for field in fields.iter() {
|
||||
check_pat(pcx, &*field.node.pat, ty::mk_err());
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
||||
// aux-build:use_from_trait_xc.rs
|
||||
|
||||
extern crate use_from_trait_xc;
|
||||
pub use use_from_trait_xc::Trait;
|
||||
|
||||
fn main() {
|
||||
match () {
|
||||
Trait { x: 42u } => () //~ ERROR use of trait `Trait` in a struct pattern
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue