---

yaml
---
r: 211197
b: refs/heads/try
c: 98f41ff
h: refs/heads/master
i:
  211195: 889014f
v: v3

Author: quantheory

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
-refs/heads/try: 666575861405712d302fe32cbe563ced8d98b8ad
+refs/heads/try: 98f41ff3555dba80b47ebee6f6bc8a7df697240c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_typeck/check/mod.rs

@@ -3763,21 +3763,34 @@ pub fn resolve_ty_and_def_ufcs<'a, 'b, 'tcx>(fcx: &FnCtxt<'b, 'tcx>,
                                                         &'a [ast::PathSegment],
                                                         def::Def)>
 {
+
+    // Associated constants can't depend on generic types.
+    fn have_disallowed_generic_consts<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
+                                                def: def::Def,
+                                                ty: Ty<'tcx>,
+                                                span: Span,
+                                                node_id: ast::NodeId) -> bool {
+        match def {
+            def::DefAssociatedConst(..) => {
+                if ty::type_has_params(ty) || ty::type_has_self(ty) {
+                    fcx.sess().span_err(span,
+                                        "Associated consts cannot depend \
+                                         on type parameters or Self.");
+                    fcx.write_error(node_id);
+                    return true;
+                }
+            }
+            _ => {}
+        }
+        false
+    }
+
     // If fully resolved already, we don't have to do anything.
     if path_res.depth == 0 {
-        // Associated constants can't depend on generic types.
         if let Some(ty) = opt_self_ty {
-            match path_res.full_def() {
-                def::DefAssociatedConst(..) => {
-                    if ty::type_has_params(ty) || ty::type_has_self(ty) {
-                        fcx.sess().span_err(span,
-                                            "Associated consts cannot depend \
-                                             on type parameters or Self.");
-                        fcx.write_error(node_id);
-                        return None;
-                    }
-                }
-                _ => {}
+            if have_disallowed_generic_consts(fcx, path_res.full_def(), ty,
+                                              span, node_id) {
+                return None;
             }
         }
         Some((opt_self_ty, &path.segments, path_res.base_def))
@@ -3795,18 +3808,8 @@ pub fn resolve_ty_and_def_ufcs<'a, 'b, 'tcx>(fcx: &FnCtxt<'b, 'tcx>,
         let item_name = item_segment.identifier.name;
         match method::resolve_ufcs(fcx, span, item_name, ty, node_id) {
             Ok((def, lp)) => {
-                // Associated constants can't depend on generic types.
-                match def {
-                    def::DefAssociatedConst(..) => {
-                        if ty::type_has_params(ty) || ty::type_has_self(ty) {
-                            fcx.sess().span_err(span,
-                                                "Associated consts cannot depend \
-                                                 on type parameters or Self.");
-                            fcx.write_error(node_id);
-                            return None;
-                        }
-                    }
-                    _ => {}
+                if have_disallowed_generic_consts(fcx, def, ty, span, node_id) {
+                    return None;
                 }
                 // Write back the new resolution.
                 fcx.ccx.tcx.def_map.borrow_mut()