Skip to content

Commit 11b2515

Browse files
HeroesGravealexcrichton
authored andcommitted
Removed libextra dependency from libsyntax.
1 parent 3f54ca1 commit 11b2515

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

mk/crates.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ DEPS_extra := std term sync serialize getopts collections
6060
DEPS_green := std native:context_switch
6161
DEPS_rustuv := std native:uv native:uv_support
6262
DEPS_native := std
63-
DEPS_syntax := std extra term serialize collections
63+
DEPS_syntax := std term serialize collections
6464
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
65-
collections
65+
collections extra
6666
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections
6767
DEPS_flate := std native:miniz
6868
DEPS_arena := std collections

src/librustc/util/common.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use syntax::visit;
1515
use syntax::visit::Visitor;
1616

1717
use std::local_data;
18-
use extra;
18+
use extra::time;
1919

2020
pub fn time<T, U>(do_it: bool, what: &str, u: U, f: |U| -> T) -> T {
2121
local_data_key!(depth: uint);
@@ -24,9 +24,9 @@ pub fn time<T, U>(do_it: bool, what: &str, u: U, f: |U| -> T) -> T {
2424
let old = local_data::get(depth, |d| d.map(|a| *a).unwrap_or(0));
2525
local_data::set(depth, old + 1);
2626

27-
let start = extra::time::precise_time_s();
27+
let start = time::precise_time_s();
2828
let rv = f(u);
29-
let end = extra::time::precise_time_s();
29+
let end = time::precise_time_s();
3030

3131
println!("{}time: {:3.3f} s\t{}", " ".repeat(old), end - start, what);
3232
local_data::set(depth, old);

src/libsyntax/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ This API is completely unstable and subject to change.
3232

3333
#[deny(non_camel_case_types)];
3434

35-
extern mod extra;
35+
#[cfg(test)] extern mod extra;
3636
extern mod serialize;
3737
extern mod term;
3838
extern mod collections;

0 commit comments

Comments
 (0)