---

yaml
---
r: 234234
b: refs/heads/beta
c: af3a0b0
h: refs/heads/master
v: v3

Author: ebfull

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 522d4b0a354b60b1b69d15773197c4c3dba521a5
+refs/heads/beta: af3a0b08055f9dac932264253040c3626a7052f6
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/astconv.rs

@@ -412,21 +412,26 @@ fn create_substs_for_ast_path<'tcx>(
     // they were optional (e.g. paths inside expressions).
     let mut type_substs = if param_mode == PathParamMode::Optional &&
                              types_provided.is_empty() {
+        fn default_type_parameter<'tcx>(p: &ty::TypeParameterDef<'tcx>, self_ty: Option<Ty<'tcx>>)
+                                        -> Option<ty::TypeParameterDef<'tcx>>
+        {
+            if let Some(ref default) = p.default {
+                if self_ty.is_none() && default.has_self_ty() {
+                    // There is no suitable inference default for a type parameter
+                    // that references self with no self-type provided.
+                    return None;
+                }
+            }
+
+            Some(p.clone())
+        }
+
         let mut substs = region_substs.clone();
 
         ty_param_defs
             .iter()
-            .map(|p| {
-                if let Some(ref default) = p.default {
-                    if self_ty.is_none() && default.has_self_ty() {
-                        // There is no suitable inference default for a type parameter
-                        // that references Self with no self-type provided.
-                        return this.ty_infer(None, Some(&mut substs), Some(TypeSpace), span);
-                    }
-                }
-
-                this.ty_infer(Some(p.clone()), Some(&mut substs), Some(TypeSpace), span)
-            })
+            .map(|p| this.ty_infer(default_type_parameter(p, self_ty), Some(&mut substs),
+                                   Some(TypeSpace), span))
             .collect()
     } else {
         types_provided