diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index ca8161067c2b..206404ae2040 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -752,7 +752,7 @@ impl PkgSrc {
                          `test.rs`, or `bench.rs`.");
             fail!(~"Failed to infer crates to build");
         }
-        
+
         debug!("found %u libs, %u mains, %u tests, %u benchs",
                self.libs.len(),
                self.mains.len(),
diff --git a/src/librustpkg/testsuite/pass/fancy-lib/bar.rs b/src/librustpkg/testsuite/pass/fancy-lib/bar.rs
index e300c2a3295a..ffbc6e2a7f9b 100644
--- a/src/librustpkg/testsuite/pass/fancy-lib/bar.rs
+++ b/src/librustpkg/testsuite/pass/fancy-lib/bar.rs
@@ -1,3 +1,13 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 pub fn assert_true() {
     assert!(true);
 }
diff --git a/src/librustpkg/testsuite/pass/fancy-lib/foo.rs b/src/librustpkg/testsuite/pass/fancy-lib/foo.rs
index 4b3f3923d058..542a6af402d0 100644
--- a/src/librustpkg/testsuite/pass/fancy-lib/foo.rs
+++ b/src/librustpkg/testsuite/pass/fancy-lib/foo.rs
@@ -1,2 +1,12 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 pub fn do_nothing() {
 }
\ No newline at end of file
diff --git a/src/librustpkg/testsuite/pass/install-paths/bench.rs b/src/librustpkg/testsuite/pass/install-paths/bench.rs
index 5aa6d2455cf3..e1641ccf0749 100644
--- a/src/librustpkg/testsuite/pass/install-paths/bench.rs
+++ b/src/librustpkg/testsuite/pass/install-paths/bench.rs
@@ -1,3 +1,13 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 #[bench]
 fn g() {
     let mut x = 0;
diff --git a/src/librustpkg/testsuite/pass/simple-lib/bar.rs b/src/librustpkg/testsuite/pass/simple-lib/bar.rs
index e300c2a3295a..ffbc6e2a7f9b 100644
--- a/src/librustpkg/testsuite/pass/simple-lib/bar.rs
+++ b/src/librustpkg/testsuite/pass/simple-lib/bar.rs
@@ -1,3 +1,13 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 pub fn assert_true() {
     assert!(true);
 }
diff --git a/src/librustpkg/testsuite/pass/simple-lib/foo.rs b/src/librustpkg/testsuite/pass/simple-lib/foo.rs
index 4b3f3923d058..542a6af402d0 100644
--- a/src/librustpkg/testsuite/pass/simple-lib/foo.rs
+++ b/src/librustpkg/testsuite/pass/simple-lib/foo.rs
@@ -1,2 +1,12 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 pub fn do_nothing() {
 }
\ No newline at end of file
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 1709a8d06ad1..bb162974e035 100644
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -528,7 +528,8 @@ pub fn compile_crate_from_input(input: driver::input,
         }
         None => {
             debug!("Calling compile_upto, outputs = %?", outputs);
-            let (crate, _) = driver::compile_upto(sess, cfg, input, driver::cu_parse, Some(outputs));
+            let (crate, _) = driver::compile_upto(sess, cfg, input,
+                                                  driver::cu_parse, Some(outputs));
 
             // Inject the inferred link_meta info if it's not already there
             // (assumes that name and vers are the only linkage metas)