Tidy up and pass tests

[rust.git] / tests / target / nested-visual-block.rs

diff --git a/tests/target/nested-visual-block.rs b/tests/target/nested-visual-block.rs
index 7dd75c52891fae82f13634ecf6e1ad0fe51b1aa7..95b9bc2dea20db82b5439507152cea45a4a6802b 100644 (file)
--- a/tests/target/nested-visual-block.rs
+++ b/tests/target/nested-visual-block.rs
@@ -5,35 +5,36 @@ fn main() {
         field_iter,
         "}",
         |item| match *item {
-            StructLitField::Regular(ref field) => field.span.lo,
+            StructLitField::Regular(ref field) => field.span.lo(),
             StructLitField::Base(ref expr) => {
-                let last_field_hi = fields.last().map_or(span.lo, |field| field.span.hi);
-                let snippet = context.snippet(mk_sp(last_field_hi, expr.span.lo));
+                let last_field_hi = fields.last().map_or(span.lo(), |field| field.span.hi());
+                let snippet = context.snippet(mk_sp(last_field_hi, expr.span.lo()));
                 let pos = snippet.find_uncommented("..").unwrap();
                 last_field_hi + BytePos(pos as u32)
             }
         },
         |item| match *item {
-            StructLitField::Regular(ref field) => field.span.hi,
-            StructLitField::Base(ref expr) => expr.span.hi,
+            StructLitField::Regular(ref field) => field.span.hi(),
+            StructLitField::Base(ref expr) => expr.span.hi(),
         },
         |item| {
             match *item {
-                StructLitField::Regular(ref field) => {
-                    rewrite_field(inner_context,
-                                  &field,
-                                  &Constraints::new(v_budget.checked_sub(1).unwrap_or(0), indent))
-                }
+                StructLitField::Regular(ref field) => rewrite_field(
+                    inner_context,
+                    &field,
+                    &Constraints::new(v_budget.checked_sub(1).unwrap_or(0), indent),
+                ),
                 StructLitField::Base(ref expr) => {
                     // 2 = ..
-                    expr.rewrite(inner_context,
-                                 &Constraints::new(try_opt!(v_budget.checked_sub(2)), indent + 2))
-                        .map(|s| format!("..{}", s))
+                    expr.rewrite(
+                        inner_context,
+                        &Constraints::new(try_opt!(v_budget.checked_sub(2)), indent + 2),
+                    ).map(|s| format!("..{}", s))
                 }
             }
         },
         context.codemap.span_after(span, "{"),
-        span.hi,
+        span.hi(),
     );
 
     // #1580
@@ -45,13 +46,14 @@ fn main() {
     });
 
     // #1581
-    bootstrap.checks.register(
-        "PERSISTED_LOCATIONS",
-        move || if locations2.0.inner_mut.lock().poisoned {
-            Check::new(State::Error,
-                       "Persisted location storage is poisoned due to a write failure")
+    bootstrap.checks.register("PERSISTED_LOCATIONS", move || {
+        if locations2.0.inner_mut.lock().poisoned {
+            Check::new(
+                State::Error,
+                "Persisted location storage is poisoned due to a write failure",
+            )
         } else {
             Check::new(State::Healthy, "Persisted location storage is healthy")
         }
-    );
+    });
 }