---

yaml
---
r: 34005
b: refs/heads/snap-stage3
c: e5e6d3c
h: refs/heads/master
i:
  34003: 5e2f6f1
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 10c9d7921d52ed41dadabb507fa8611f808dc485
+refs/heads/snap-stage3: e5e6d3c43d007314f12db6752e272a5a109f9b4b
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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/snap-stage3/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};