Test fixes and rebase conflicts

This commit switches over the backtrace infrastructure from piggy-backing off
the RUST_LOG environment variable to using the RUST_BACKTRACE environment
variable (logging is now disabled in libstd).

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
index 924af6bfd42..d4593318eaf 100644
--- a/src/libsync/lib.rs
+++ b/src/libsync/lib.rs
@@ -21,10 +21,10 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[feature(phase)];
 
-#[cfg(test)] #[phase(syntax, link)] extern crate log;
-
 #[allow(deprecated_owned_vector)];
 
+#[cfg(test)] #[phase(syntax, link)] extern crate log;
+
 pub use arc::{Arc, MutexArc, RWArc, RWWriteMode, RWReadMode, ArcCondvar, CowArc};
 pub use sync::{Mutex, RWLock, Condvar, Semaphore, RWLockWriteMode,
                RWLockReadMode, Barrier, one, mutex};