diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-12 23:34:31 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-15 22:56:46 -0700 |
| commit | 0015cab1fd7b4b47030c808a825bb5594cc1d4ac (patch) | |
| tree | cf054fdf43843170e6479675e62a29b6213e2ce2 /src/libworkcache | |
| parent | 17ad504fef35191fe53874bd2fe77ffd14d8e1b9 (diff) | |
| download | rust-0015cab1fd7b4b47030c808a825bb5594cc1d4ac.tar.gz rust-0015cab1fd7b4b47030c808a825bb5594cc1d4ac.zip | |
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).
Diffstat (limited to 'src/libworkcache')
| -rw-r--r-- | src/libworkcache/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs index ce7557fb2aa..219bb38b3c8 100644 --- a/src/libworkcache/lib.rs +++ b/src/libworkcache/lib.rs @@ -15,8 +15,10 @@ #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; +#[feature(phase)]; #[allow(deprecated_owned_vector, visible_private_types)]; +#[phase(syntax, link)] extern crate log; extern crate serialize; extern crate collections; extern crate sync; |