Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f6fcdbb

Browse files
committedMar 16, 2014
auto merge of #12791 : alexcrichton/rust/liblog, r=brson
The rationale and modifications can be found in the first commit message. This does make logging a bit more painful to use initially because it involves a feature gate and some `phase` attributes, but I think it may be reasonable to not require the `phase` attribute for loading `macro_rules!` macros because defining them will still be gated.
2 parents abd844e + 0015cab commit f6fcdbb

File tree

392 files changed

+1709
-1880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

392 files changed

+1709
-1880
lines changed
 

‎mk/crates.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
TARGET_CRATES := std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url
54+
workcache url log
5555
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
@@ -60,15 +60,15 @@ DEPS_std := native:rustrt native:compiler-rt native:backtrace
6060
DEPS_green := std rand native:context_switch
6161
DEPS_rustuv := std native:uv native:uv_support
6262
DEPS_native := std
63-
DEPS_syntax := std term serialize collections
63+
DEPS_syntax := std term serialize collections log
6464
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
65-
collections time
65+
collections time log
6666
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
6767
test time
6868
DEPS_flate := std native:miniz
6969
DEPS_arena := std collections
7070
DEPS_glob := std
71-
DEPS_serialize := std collections
71+
DEPS_serialize := std collections log
7272
DEPS_term := std collections
7373
DEPS_semver := std
7474
DEPS_uuid := std serialize rand
@@ -82,7 +82,8 @@ DEPS_test := std collections getopts serialize term time
8282
DEPS_time := std serialize
8383
DEPS_rand := std
8484
DEPS_url := std collections
85-
DEPS_workcache := std serialize collections std
85+
DEPS_workcache := std serialize collections log
86+
DEPS_log := std sync
8687

8788
TOOL_DEPS_compiletest := test green rustuv getopts
8889
TOOL_DEPS_rustdoc := rustdoc native

‎src/compiletest/compiletest.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
// except according to those terms.
1010

1111
#[crate_type = "bin"];
12+
#[feature(phase)];
1213

1314
#[allow(non_camel_case_types)];
1415
#[deny(warnings)];
1516
#[allow(deprecated_owned_vector)];
1617

1718
extern crate test;
1819
extern crate getopts;
20+
#[phase(link, syntax)]
21+
extern crate log;
1922

2023
use std::os;
2124
use std::io;

0 commit comments

Comments
 (0)
Please sign in to comment.