auto merge of #6603 : thestinger/rust/whitespace, r=thestinger

12 files changed, 4 insertions, 15 deletions

diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs
index 2f24a8ceb24..b33b64921b4 100644
--- a/src/librustc/middle/borrowck/check_loans.rs
+++ b/src/librustc/middle/borrowck/check_loans.rs
@@ -816,4 +816,3 @@ fn check_loans_in_block<'a>(blk: &ast::blk,
     visit::visit_block(blk, this, vt);
     this.check_for_conflicting_loans(blk.node.id);
 }
-
diff --git a/src/librustc/middle/borrowck/gather_loans/mod.rs b/src/librustc/middle/borrowck/gather_loans/mod.rs
index 64d32d713d0..0db7b4880e7 100644
--- a/src/librustc/middle/borrowck/gather_loans/mod.rs
+++ b/src/librustc/middle/borrowck/gather_loans/mod.rs
@@ -634,4 +634,3 @@ fn add_stmt_to_map(stmt: @ast::stmt,
     }
     visit::visit_stmt(stmt, this, vt);
 }
-
diff --git a/src/librustc/middle/borrowck/gather_loans/restrictions.rs b/src/librustc/middle/borrowck/gather_loans/restrictions.rs
index 0be4c67a9bc..3760350dc26 100644
--- a/src/librustc/middle/borrowck/gather_loans/restrictions.rs
+++ b/src/librustc/middle/borrowck/gather_loans/restrictions.rs
@@ -246,4 +246,3 @@ impl RestrictionsContext {
         }
     }
 }
-
diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs
index 31d22b76800..648daaf3cd1 100644
--- a/src/librustc/middle/dataflow.rs
+++ b/src/librustc/middle/dataflow.rs
@@ -1062,4 +1062,3 @@ fn reslice<'a>(v: &'a mut [uint]) -> &'a [uint] {
         cast::transmute(v)
     }
 }
-
diff --git a/src/librustc/middle/trans/write_guard.rs b/src/librustc/middle/trans/write_guard.rs
index 18f21b489b0..8a6b4acac8e 100644
--- a/src/librustc/middle/trans/write_guard.rs
+++ b/src/librustc/middle/trans/write_guard.rs
@@ -198,4 +198,3 @@ fn perform_write_guard(datum: &Datum,
           line],
         expr::Ignore)
 }
-
diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index f1ba759acd7..c1aaa428715 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -676,4 +676,3 @@ impl PkgSrc {
         self.build_crates(maybe_sysroot, dst_dir, &dir, self.benchs, cfgs, Bench);
     }
 }
-
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 275a7b963a4..8b657b13fa9 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -858,4 +858,3 @@ impl AstFoldExtensions for @ast_fold {
 pub fn make_fold(afp: ast_fold_fns) -> @ast_fold {
     afp as @ast_fold
 }
-
diff --git a/src/test/auxiliary/mod_trait_with_static_methods_lib.rs b/src/test/auxiliary/mod_trait_with_static_methods_lib.rs
index b060c7aee49..2099c6a2f2f 100644
--- a/src/test/auxiliary/mod_trait_with_static_methods_lib.rs
+++ b/src/test/auxiliary/mod_trait_with_static_methods_lib.rs
@@ -19,4 +19,3 @@ pub mod sub_foo {
         pub fn foo() -> int { 42 }
     }
 }
-
diff --git a/src/test/compile-fail/regions-infer-borrow-scope-within-loop.rs b/src/test/compile-fail/regions-infer-borrow-scope-within-loop.rs
index 50ac5f65772..3b88c634598 100644
--- a/src/test/compile-fail/regions-infer-borrow-scope-within-loop.rs
+++ b/src/test/compile-fail/regions-infer-borrow-scope-within-loop.rs
@@ -15,8 +15,8 @@ fn foo(cond: &fn() -> bool, box: &fn() -> @int) {
     loop {
         let x = box();
 
-	    // Here we complain because the resulting region
-	    // of this borrow is the fn body as a whole.
+        // Here we complain because the resulting region
+        // of this borrow is the fn body as a whole.
         y = borrow(x); //~ ERROR cannot root
 
         assert!(*x == *y);
diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/run-pass/intrinsic-atomics.rs
index d4701f74488..4105e6003b5 100644
--- a/src/test/run-pass/intrinsic-atomics.rs
+++ b/src/test/run-pass/intrinsic-atomics.rs
@@ -17,7 +17,7 @@ mod rusti {
 
         pub fn atomic_load(src: &int) -> int;
         pub fn atomic_load_acq(src: &int) -> int;
-        
+
         pub fn atomic_store(dst: &mut int, val: int);
         pub fn atomic_store_rel(dst: &mut int, val: int);
 
@@ -42,7 +42,7 @@ pub fn main() {
         assert!(rusti::atomic_load(x) == 1);
         *x = 5;
         assert!(rusti::atomic_load_acq(x) == 5);
-        
+
         rusti::atomic_store(x,3);
         assert!(*x == 3);
         rusti::atomic_store_rel(x,1);
diff --git a/src/test/run-pass/issue-5353.rs b/src/test/run-pass/issue-5353.rs
index f933b616119..cc1bb2dd037 100644
--- a/src/test/run-pass/issue-5353.rs
+++ b/src/test/run-pass/issue-5353.rs
@@ -22,5 +22,3 @@ fn gl_err_str(err: u32) -> ~str
 }
 
 fn main() {}
-
-
diff --git a/src/test/run-pass/match-range-static.rs b/src/test/run-pass/match-range-static.rs
index 3eefc386250..aa216b8d054 100644
--- a/src/test/run-pass/match-range-static.rs
+++ b/src/test/run-pass/match-range-static.rs
@@ -7,4 +7,3 @@ fn main() {
         _ => (),
     }
 }
-