---

yaml
---
r: 39282
b: refs/heads/incoming
c: e5e6d3c
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 10c9d7921d52ed41dadabb507fa8611f808dc485
+refs/heads/incoming: e5e6d3c43d007314f12db6752e272a5a109f9b4b
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/meth.rs

@@ -372,7 +372,8 @@ fn method_ty_param_count(ccx: @crate_ctxt, m_id: ast::def_id,
             None => {
                 match ccx.tcx.provided_method_sources.find(m_id) {
                     Some(source) => {
-                        method_ty_param_count(ccx, source.method_id, source.impl_id)
+                        method_ty_param_count(
+                            ccx, source.method_id, source.impl_id)
                     }
                     None => fail
                 }

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

@@ -438,9 +438,9 @@ type ctxt =
       normalized_cache: HashMap<t, t>,
       lang_items: middle::lang_items::LanguageItems,
       legacy_boxed_traits: HashMap<node_id, ()>,
-      // A mapping from an implementation ID to the method info and trait method
-      // ID of the provided (a.k.a. default) methods in the traits that that
-      // implementation implements.
+      // A mapping from an implementation ID to the method info and trait
+      // method ID of the provided (a.k.a. default) methods in the traits that
+      // that implementation implements.
       provided_methods: ProvidedMethodsMap,
       provided_method_sources: HashMap<ast::def_id, ProvidedMethodSource>,
       supertraits: HashMap<ast::def_id, @~[InstantiatedTraitRef]>,

branches/incoming/src/librustc/middle/typeck/coherence.rs

@@ -19,7 +19,8 @@ use metadata::csearch::{get_impls_for_mod};
 use metadata::cstore::{CStore, iter_crate_data};
 use metadata::decoder::{dl_def, dl_field, dl_impl};
 use middle::resolve::{Impl, MethodInfo};
-use middle::ty::{DerivedMethodInfo, ProvidedMethodSource, ProvidedMethodInfo, get};
+use middle::ty::{DerivedMethodInfo, ProvidedMethodSource,
+                 ProvidedMethodInfo, get};
 use middle::ty::{lookup_item_type, subst, t, ty_bot, ty_box, ty_class};
 use middle::ty::{ty_bool, ty_enum, ty_int, ty_nil, ty_ptr, ty_rptr, ty_uint};
 use middle::ty::{ty_float, ty_estr, ty_evec, ty_rec, ty_uniq};