auto merge of rust-lang#20997 : nikomatsakis/rust/assoc-types-enum-fi…

…eld-access, r=nick29581

Various fixes to enum field access. Builds on PR rust-lang#20955.

r? @nick29581

src/librustc_trans/trans/base.rs

@@ -702,9 +702,8 @@ pub fn iter_structural_ty<'blk, 'tcx, F>(cx: Block<'blk, 'tcx>,
         let mut cx = cx;
 
         for (i, &arg) in variant.args.iter().enumerate() {
-            cx = (*f)(cx,
-                   adt::trans_field_ptr(cx, repr, av, variant.disr_val, i),
-                   arg.subst(tcx, substs));
+            let arg = monomorphize::apply_param_substs(tcx, substs, &arg);
+            cx = f(cx, adt::trans_field_ptr(cx, repr, av, variant.disr_val, i), arg);
         }
         return cx;
     }

src/librustc_typeck/check/_match.rs

@@ -619,6 +619,8 @@ pub fn check_struct_pat_fields<'a, 'tcx>(pcx: &pat_ctxt<'a, 'tcx>,
             }
         };
 
+        let field_type = pcx.fcx.normalize_associated_types_in(span, &field_type);
+
         check_pat(pcx, &*field.pat, field_type);
     }
 

src/test/run-pass/associated-types-enum-field-named.rs

@@ -0,0 +1,43 @@
+// Copyright 2015 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.
+
+// Test associated types appearing in struct-like enum variants.
+
+use self::VarValue::*;
+
+pub trait UnifyKey {
+    type Value;
+    fn to_index(&self) -> usize;
+}
+
+pub enum VarValue<K:UnifyKey> {
+    Redirect { to: K },
+    Root { value: K::Value, rank: usize },
+}
+
+fn get<'a,K:UnifyKey<Value=Option<V>>,V>(table: &'a Vec<VarValue<K>>, key: &K) -> &'a Option<V> {
+    match table[key.to_index()] {
+        VarValue::Redirect { to: ref k } => get(table, k),
+        VarValue::Root { value: ref v, rank: _ } => v,
+    }
+}
+
+impl UnifyKey for usize {
+    type Value = Option<char>;
+    fn to_index(&self) -> usize { *self }
+}
+
+fn main() {
+    let table = vec![/* 0 */ Redirect { to: 1 },
+                     /* 1 */ Redirect { to: 3 },
+                     /* 2 */ Root { value: Some('x'), rank: 0 },
+                     /* 3 */ Redirect { to: 2 }];
+    assert_eq!(get(&table, &0), &Some('x'));
+}

src/test/run-pass/associated-types-enum-field-numbered.rs

@@ -0,0 +1,43 @@
+// Copyright 2015 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.
+
+// Test associated types appearing in tuple-like enum variants.
+
+use self::VarValue::*;
+
+pub trait UnifyKey {
+    type Value;
+    fn to_index(&self) -> usize;
+}
+
+pub enum VarValue<K:UnifyKey> {
+    Redirect(K),
+    Root(K::Value, usize),
+}
+
+fn get<'a,K:UnifyKey<Value=Option<V>>,V>(table: &'a Vec<VarValue<K>>, key: &K) -> &'a Option<V> {
+    match table[key.to_index()] {
+        VarValue::Redirect(ref k) => get(table, k),
+        VarValue::Root(ref v, _) => v,
+    }
+}
+
+impl UnifyKey for usize {
+    type Value = Option<char>;
+    fn to_index(&self) -> usize { *self }
+}
+
+fn main() {
+    let table = vec![/* 0 */ Redirect(1),
+                     /* 1 */ Redirect(3),
+                     /* 2 */ Root(Some('x'), 0),
+                     /* 3 */ Redirect(2)];
+    assert_eq!(get(&table, &0), &Some('x'));
+}