nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

librustc: Fix pattern matching on cross crate newtype structs.

Browse Source
This commit is contained in:
Luqman Aden 2013-04-29 17:21:59 -07:00
parent dbcc3fe63a
commit b50aa827a0
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/middle/check_match.rs
View File

@ -551,6 +551,8 @@ pub fn specialize(cx: @MatchCheckCtxt,
Some(vec::append(args, vec::from_slice(r.tail())))
}
def_variant(_, _) => None,
def_fn(*) |
def_struct(*) => {
// FIXME #4731: Is this right? --pcw
let new_args;

1
src/librustc/middle/mem_categorization.rs
View File

@ -915,6 +915,7 @@ pub impl mem_categorization_ctxt {
self.cat_pattern(subcmt, *subpat, op);
}
}
Some(&ast::def_fn(*)) |
Some(&ast::def_struct(*)) => {
for subpats.each |subpat| {
let cmt_field = self.cat_anon_struct_field(*subpat,

1
src/librustc/middle/resolve.rs
View File

@ -4279,6 +4279,7 @@ pub impl Resolver {
pat_enum(path, _) => {
// This must be an enum variant, struct or const.
match self.resolve_path(path, ValueNS, false, visitor) {
Some(def @ def_fn(*)) |
Some(def @ def_variant(*)) |
Some(def @ def_struct(*)) |
Some(def @ def_const(*)) => {

4
src/librustc/middle/trans/_match.rs
View File

@ -291,6 +291,7 @@ pub fn variant_opt(bcx: block, pat_id: ast::node_id)
}
::core::util::unreachable();
}
ast::def_fn(*) |
ast::def_struct(_) => {
return lit(UnitLikeStructLit(pat_id));
}
@ -818,6 +819,7 @@ pub fn get_options(bcx: block, m: &[@Match], col: uint) -> ~[Opt] {
// This could be one of: a tuple-like enum variant, a
// struct-like enum variant, or a struct.
match ccx.tcx.def_map.find(&cur.id) {
Some(&ast::def_fn(*)) |
Some(&ast::def_variant(*)) => {
add_to_set(ccx.tcx, &mut found,
variant_opt(bcx, cur.id));
@ -1011,6 +1013,7 @@ pub fn any_tuple_struct_pat(bcx: block, m: &[@Match], col: uint) -> bool {
match pat.node {
ast::pat_enum(_, Some(_)) => {
match bcx.tcx().def_map.find(&pat.id) {
Some(&ast::def_fn(*)) |
Some(&ast::def_struct(*)) => true,
_ => false
}
@ -1780,6 +1783,7 @@ pub fn bind_irrefutable_pat(bcx: block,
}
}
}
Some(&ast::def_fn(*)) |
Some(&ast::def_struct(*)) => {
match *sub_pats {
None => {