---

yaml
---
r: 228764
b: refs/heads/try
c: e857871
h: refs/heads/master
v: v3

Author: jroesch

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 01dcb3bdf0fd779208c915d704ae634beb5c4448
+refs/heads/try: e85787102fa6a7b27e1df845c07084f6a7d77fe3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -1141,7 +1141,11 @@ impl<'a, 'tcx> AstConv<'tcx> for FnCtxt<'a, 'tcx> {
 
     fn ty_infer(&self, ty_param_def: Option<ty::TypeParameterDef<'tcx>>, span: Span) -> Ty<'tcx> {
         let default = ty_param_def.and_then(|t|
-            t.default.map(|ty| type_variable::Default { ty: ty, origin_span: span, definition_span: span }));
+            t.default.map(|ty| type_variable::Default {
+                ty: ty,
+                origin_span: span,
+                definition_span: span
+        }));
         self.infcx().next_ty_var_with_default(default)
     }
 

branches/try/src/test/run-pass/default_ty_param_default_dependent_associated_type.rs

@@ -0,0 +1,33 @@
+// 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.
+//
+use std::marker::PhantomData;
+
+trait Id {
+    type This;
+}
+
+impl<A> Id for A {
+    type This = A;
+}
+
+struct Foo<X: Default = usize, Y = <X as Id>::This> {
+    data: PhantomData<(X, Y)>
+}
+
+impl<X: Default, Y> Foo<X, Y> {
+    fn new() -> Foo<X, Y> {
+        Foo { data: PhantomData }
+    }
+}
+
+fn main() {
+    let foo = Foo::new();
+}

branches/try/src/test/run-pass/default_ty_param_dependent_defaults.rs

@@ -0,0 +1,18 @@
+// 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.
+//
+
+use std::marker::PhantomData;
+
+struct Foo<T,U=T> { data: PhantomData<(T, U)> }
+
+fn main() {
+    let foo = Foo { data: PhantomData };
+}

branches/try/src/test/run-pass/default_type_parameter_struct_and_type_alias.rs renamed to branches/try/src/test/run-pass/default_ty_param_struct_and_type_alias.rs

@@ -1,7 +1,15 @@
-use std::marker::PhantomData;
+// 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.
+//
 
-trait TypeEq<A> {}
-impl<A> TypeEq<A> for A {}
+use std::marker::PhantomData;
 
 struct DeterministicHasher;
 struct RandomHasher;