Address nits and fix tidy ... again

Author: jroesch

src/librustc_typeck/check/mod.rs

@@ -1876,9 +1876,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             let _ = self.infcx().commit_if_ok(|_: &infer::CombinedSnapshot| {
                 for &(ref ty, ref default) in &has_user_default {
                     let default = default.clone();
-                    let normalized_default = self.inh.normalize_associated_types_in(codemap::DUMMY_SP, 0, &default.ty);
+
+                    let normalized_default = self.inh.normalize_associated_types_in(
+                        default.origin_span,
+                        0, &default.ty);
+
                     match infer::mk_eqty(self.infcx(), false,
-                                         infer::Misc(codemap::DUMMY_SP), // default.origin_span),
+                                         infer::Misc(default.origin_span),
                                          ty, normalized_default) {
                         Ok(()) => {}
                         Err(_) => {
@@ -1887,7 +1891,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     }
                 }
 
-
                 // If there are conflicts we rollback, otherwise commit
                 if conflicts.len() > 0 {
                     Err(())
@@ -1976,9 +1979,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // reporting for more then one conflict.
         for &(ref ty, ref default) in tys_with_defaults {
             let default = default.clone();
-            let normalized_default = self.inh.normalize_associated_types_in(codemap::DUMMY_SP, 0, &default.ty);
+
+            let normalized_default = self.inh.normalize_associated_types_in(
+                default.origin_span, 0,
+                &default.ty);
+
             match infer::mk_eqty(self.infcx(), false,
-                                 infer::Misc(codemap::DUMMY_SP), // default.origin_span),
+                                 infer::Misc(default.origin_span),
                                  ty, normalized_default) {
                 Ok(()) => {}
                 Err(_) => {

src/test/compile-fail/default_ty_param_conflict.rs renamed to src/test/compile-fail/default_ty_param_fallback_conflict.rs

@@ -0,0 +1,16 @@
+// 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.
+
+#![feature(default_type_parameter_fallback)]
+#![feature(iter_arith)]
+
+fn main() {
+   print!("{}", (1..4).sum());
+}