---

yaml
---
r: 235841
b: refs/heads/stable
c: 7716541
h: refs/heads/master
i:
  235839: 5963f11
v: v3

Author: jroesch

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 99a12933fb83b1df7975257c323eb414abeb0b16
+refs/heads/stable: 77165415b7b4aecff6b5959647f675ddf34c222a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc/middle/ty.rs

@@ -5453,7 +5453,8 @@ impl<'tcx> ctxt<'tcx> {
                                              expected.ty,
                                              found.ty));
 
-                match (expected.def_id.krate == ast::LOCAL_CRATE, self.map.opt_span(expected.def_id.node)) {
+                match (expected.def_id.krate == ast::LOCAL_CRATE,
+                       self.map.opt_span(expected.def_id.node)) {
                     (true, Some(span)) => {
                         self.sess.span_note(span,
                                             &format!("a default was defined here..."));
@@ -5464,15 +5465,17 @@ impl<'tcx> ctxt<'tcx> {
                                         .map(|p| p.to_string())
                                         .collect::<Vec<_>>();
                         self.sess.note(
-                            &format!("a default is defined on `{}`", 
+                            &format!("a default is defined on `{}`",
                                      elems.join("::")));
                     }
                 }
 
-                self.sess.span_note(expected.origin_span,
-                                    &format!("...that was applied to an unconstrained type variable here"));
+                self.sess.span_note(
+                    expected.origin_span,
+                    &format!("...that was applied to an unconstrained type variable here"));
 
-                match (found.def_id.krate == ast::LOCAL_CRATE, self.map.opt_span(found.def_id.node)) {
+                match (found.def_id.krate == ast::LOCAL_CRATE,
+                       self.map.opt_span(found.def_id.node)) {
                     (true, Some(span)) => {
                         self.sess.span_note(span,
                                             &format!("a second default was defined here..."));
@@ -5488,8 +5491,9 @@ impl<'tcx> ctxt<'tcx> {
                     }
                 }
 
-                self.sess.span_note(found.origin_span,
-                                    &format!("...that also applies to the same type variable here"));
+                self.sess.span_note(
+                    found.origin_span,
+                    &format!("...that also applies to the same type variable here"));
             }
             _ => {}
         }

branches/stable/src/librustc_typeck/check/method/confirm.rs

@@ -349,7 +349,9 @@ impl<'a,'tcx> ConfirmContext<'a,'tcx> {
         } else if num_supplied_types != num_method_types {
             span_err!(self.tcx().sess, self.span, E0036,
                 "incorrect number of type parameters given for this method");
-            final_substs.types.replace(subst::FnSpace, vec![self.tcx().types.err; num_method_types]);
+            final_substs.types.replace(
+                subst::FnSpace,
+                vec![self.tcx().types.err; num_method_types]);
         } else {
             final_substs.types.replace(subst::FnSpace, supplied_method_types);
         }

branches/stable/src/librustc_typeck/check/method/mod.rs

@@ -190,7 +190,7 @@ pub fn lookup_in_trait_adjusted<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>,
                 type_parameter_defs);
         }
     }
-    
+
     let trait_ref = ty::TraitRef::new(trait_def_id, fcx.tcx().mk_substs(substs));
 
     // Construct an obligation