mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #16554 : jakub-/rust/struct-pat-fields-ty-err, r=pcwalton

Browse Source 
Fixes #16338.
Fixed #16401.
This commit is contained in:
bors 2014-08-17 21:16:10 +00:00
commit 776c17f476
3 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,8 +355,7 @@ pub fn check_struct_pat_fields(pcx: &pat_ctxt,
}
}
pub fn check_struct_pat(pcx: &pat_ctxt, _pat_id: ast::NodeId, span: Span,
_expected: ty::t, _path: &ast::Path,
pub fn check_struct_pat(pcx: &pat_ctxt, span: Span,
fields: &[ast::FieldPat], etc: bool,
struct_id: ast::DefId,
substitutions: &subst::Substs) {
@ -529,8 +528,7 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
},
}
check_struct_pat(pcx, pat.id, pat.span, expected, path,
fields.as_slice(), etc, cid, substs);
check_struct_pat(pcx, pat.span, fields.as_slice(), etc, cid, substs);
}
ty::ty_enum(eid, ref substs) => {
check_struct_like_enum_variant_pat(pcx,
@ -557,15 +555,11 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
None);
match tcx.def_map.borrow().find(&pat.id) {
Some(def) => {
check_struct_pat(pcx,
pat.id,
pat.span,
ty::mk_err(),
path,
fields.as_slice(),
etc,
def.def_id(),
&subst::Substs::empty());
let item_type = ty::lookup_item_type(tcx, def.def_id());
let substitutions = fcx.infcx().fresh_substs_for_type(
pat.span, &item_type.generics);
check_struct_pat(pcx, pat.span, fields.as_slice(),
etc, def.def_id(), &substitutions);
}
None => {
tcx.sess.span_bug(pat.span,

17
src/test/compile-fail/issue-16338.rs Normal file
View File

@ -0,0 +1,17 @@
// 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.
use std::raw::Slice;
fn main() {
let Slice { data: data, len: len } = "foo";
//~^ ERROR mismatched types: expected `&'static str` but found a structure pattern
}

19
src/test/compile-fail/issue-16401.rs Normal file
View File

@ -0,0 +1,19 @@
// 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.
use std::raw::Slice;
fn main() {
match () {
Slice { data: data, len: len } => (),
//~^ ERROR mismatched types: expected `()` but found a structure pattern
_ => unreachable!()
}
}