Re-enable tidy (it was broken) and fix various non-tidy things.

5 files changed, 15 insertions, 10 deletions

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index 24f5140d8a0..c89e6f808a8 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -375,7 +375,8 @@ fn truncated_sha1_result(sha1 sha) -> str {
 
 
 // This calculates STH for a symbol, as defined above
-fn symbol_hash(ty::ctxt tcx, sha1 sha, &ty::t t, &link_meta link_meta) -> str {
+fn symbol_hash(ty::ctxt tcx, sha1 sha, &ty::t t,
+               &link_meta link_meta) -> str {
     // NB: do *not* use abbrevs here as we want the symbol names
     // to be independent of one another in the crate.
 
diff --git a/src/comp/metadata/encoder.rs b/src/comp/metadata/encoder.rs
index 2927e77d4b1..205ac5649df 100644
--- a/src/comp/metadata/encoder.rs
+++ b/src/comp/metadata/encoder.rs
@@ -180,7 +180,8 @@ fn encode_type(&@crate_ctxt cx, &ebml::writer ebml_w, &ty::t typ) {
     ebml::start_tag(ebml_w, tag_items_data_item_type);
     auto f = def_to_str;
     auto ty_str_ctxt =
-        @rec(ds=f, tcx=cx.tcx, abbrevs=tyencode::ac_use_abbrevs(cx.type_abbrevs));
+        @rec(ds=f, tcx=cx.tcx,
+             abbrevs=tyencode::ac_use_abbrevs(cx.type_abbrevs));
     tyencode::enc_ty(io::new_writer_(ebml_w.writer), ty_str_ctxt, typ);
     ebml::end_tag(ebml_w);
 }
@@ -346,7 +347,8 @@ fn encode_info_for_items(&@crate_ctxt cx, &ebml::writer ebml_w) ->
    vec[tup(int, uint)] {
     let vec[tup(int, uint)] index = [];
     ebml::start_tag(ebml_w, tag_items_data);
-    for each (@tup(node_id, middle::ast_map::ast_node) kvp in cx.ast_map.items()) {
+    for each (@tup(node_id, middle::ast_map::ast_node) kvp in
+              cx.ast_map.items()) {
         alt (kvp._1) {
             case (middle::ast_map::node_item(?i)) {
                 index += [tup(kvp._0, ebml_w.writer.tell())];
@@ -458,10 +460,10 @@ fn encode_attributes(&ebml::writer ebml_w, &vec[attribute] attrs) {
     ebml::end_tag(ebml_w);
 }
 
-// So there's a special crate attribute called 'link' which defines the metadata
-// that Rust cares about for linking crates. This attribute requires name and
-// value attributes, so if the user didn't provide them we will throw them in
-// anyway with default values.
+// So there's a special crate attribute called 'link' which defines the
+// metadata that Rust cares about for linking crates. This attribute requires
+// name and value attributes, so if the user didn't provide them we will throw
+// them in anyway with default values.
 fn synthesize_crate_attrs(&@crate_ctxt cx,
                           &@crate crate) -> vec[attribute] {
 
diff --git a/src/comp/middle/tstate/states.rs b/src/comp/middle/tstate/states.rs
index 2d81f0cf0aa..44a9240fd5b 100644
--- a/src/comp/middle/tstate/states.rs
+++ b/src/comp/middle/tstate/states.rs
@@ -631,7 +631,7 @@ fn find_pre_post_state_stmt(&fn_ctxt fcx, &prestate pres, @stmt s) -> bool {
                             // let int = x; => x is uninit in poststate
                             set_poststate_ann(fcx.ccx, id, pres);
                             clear_in_poststate_ident(fcx, alocal.node.id,
-                                                         alocal.node.ident, id);
+                                                     alocal.node.ident, id);
                             set_prestate(stmt_ann, pres);
                             ret false;
                         }
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index 5bf0c281f67..f669970898e 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -1528,7 +1528,8 @@ fn equal_type_structures(&sty a, &sty b) -> bool {
                     auto len = vec::len[mt](mts_a);
                     if (len != vec::len[mt](mts_b)) { ret false; }
                     auto i = 0u;
-                    while (i < len) {                        if (!equal_mt(mts_a.(i), mts_b.(i))) { ret false; }
+                    while (i < len) {
+                        if (!equal_mt(mts_a.(i), mts_b.(i))) { ret false; }
                         i += 1u;
                     }
                     ret true;
diff --git a/src/comp/middle/visit.rs b/src/comp/middle/visit.rs
index b6a96453d1b..2b84747046e 100644
--- a/src/comp/middle/visit.rs
+++ b/src/comp/middle/visit.rs
@@ -134,7 +134,8 @@ fn visit_item[E](&@item i, &E e, &vt[E] v) {
             alt (ob.dtor) {
                 case (none) { }
                 case (some(?m)) {
-                    vt(v).visit_fn(m.node.meth, [], m.span, some(m.node.ident),
+                    vt(v).visit_fn(m.node.meth, [], m.span,
+                                   some(m.node.ident),
                                    m.node.id, e, v);
                 }
             }