Auto merge of #47161 - MaloJaffre:compiler-docs-regression, r=alexcrichton

bors · bors · commit ee220daca345 · 2018-01-07T18:50:30.000Z
Try to fix a perf regression by updating log Upgrade `log` to `0.4` in multiple crates ~and `cargo`~. Cc: #47154.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
@@ -14,7 +14,7 @@ bitflags = "1.0"
 fmt_macros = { path = "../libfmt_macros" }
 graphviz = { path = "../libgraphviz" }
 jobserver = "0.1"
-log = "0.3"
+log = "0.4"
 rustc_apfloat = { path = "../librustc_apfloat" }
 rustc_back = { path = "../librustc_back" }
 rustc_const_math = { path = "../librustc_const_math" }
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
@@ -1068,7 +1068,7 @@ pub fn map_crate<'hir>(sess: &::session::Session,
                                                   cmdline_args)
     };
 
-    if log_enabled!(::log::LogLevel::Debug) {
+    if log_enabled!(::log::Level::Debug) {
         // This only makes sense for ordered stores; note the
         // enumerate to count the number of entries.
         let (entries_less_1, _) = map.iter().filter(|&x| {
diff --git a/src/librustc_back/Cargo.toml b/src/librustc_back/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
 [dependencies]
 syntax = { path = "../libsyntax" }
 serialize = { path = "../libserialize" }
-log = "0.3"
+log = "0.4"
 rand = "0.3"
 
 [features]
diff --git a/src/librustc_borrowck/Cargo.toml b/src/librustc_borrowck/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 test = false
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
 graphviz = { path = "../libgraphviz" }
diff --git a/src/librustc_const_eval/Cargo.toml b/src/librustc_const_eval/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 
 [dependencies]
 arena = { path = "../libarena" }
-log = "0.3"
+log = "0.4"
 rustc = { path = "../librustc" }
 rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml
@@ -9,12 +9,12 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 serialize = { path = "../libserialize" }
 cfg-if = "0.1.2"
 stable_deref_trait = "1.0.0"
 parking_lot_core = "0.2.8"
 
 [dependencies.parking_lot]
 version = "0.5"
-features = ["nightly"]
+features = ["nightly"]
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
 [dependencies]
 arena = { path = "../libarena" }
 graphviz = { path = "../libgraphviz" }
-log = { version = "0.3", features = ["release_max_level_info"] }
+log = { version = "0.4", features = ["release_max_level_info"] }
 env_logger = { version = "0.4", default-features = false }
 rustc = { path = "../librustc" }
 rustc_allocator = { path = "../librustc_allocator" }
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
@@ -253,14 +253,14 @@ pub fn compile_input(sess: &Session,
 
             result?;
 
-            if log_enabled!(::log::LogLevel::Info) {
+            if log_enabled!(::log::Level::Info) {
                 println!("Pre-trans");
                 tcx.print_debug_stats();
             }
 
             let trans = phase_4_translate_to_llvm::<DefaultTransCrate>(tcx, rx);
 
-            if log_enabled!(::log::LogLevel::Info) {
+            if log_enabled!(::log::Level::Info) {
                 println!("Post-trans");
                 tcx.print_debug_stats();
             }
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 
 [dependencies]
 graphviz = { path = "../libgraphviz" }
-log = "0.3"
+log = "0.4"
 rand = "0.3"
 rustc = { path = "../librustc" }
 rustc_data_structures = { path = "../librustc_data_structures" }
diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 test = false
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 rustc = { path = "../librustc" }
 rustc_const_eval = { path = "../librustc_const_eval" }
 syntax = { path = "../libsyntax" }
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 
 [dependencies]
 flate2 = "1.0"
-log = "0.3"
+log = "0.4"
 proc_macro = { path = "../libproc_macro" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
@@ -1051,7 +1051,7 @@ impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {
         self.inject_allocator_crate(krate);
         self.inject_panic_runtime(krate);
 
-        if log_enabled!(log::LogLevel::Info) {
+        if log_enabled!(log::Level::Info) {
             dump_crates(&self.cstore);
         }
     }
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
 [dependencies]
 bitflags = "1.0"
 graphviz = { path = "../libgraphviz" }
-log = "0.3"
+log = "0.4"
 log_settings = "0.1.1"
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
@@ -781,7 +781,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
             }
         }
 
-        if log_enabled!(::log::LogLevel::Trace) {
+        if log_enabled!(::log::Level::Trace) {
             self.dump_local(dest);
         }
 
diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs
@@ -209,7 +209,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {
             }
         };
 
-        if log_enabled!(::log::LogLevel::Trace) {
+        if log_enabled!(::log::Level::Trace) {
             self.dump_local(place);
         }
 
diff --git a/src/librustc_passes/Cargo.toml b/src/librustc_passes/Cargo.toml
@@ -9,7 +9,7 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 rustc = { path = "../librustc" }
 rustc_const_eval = { path = "../librustc_const_eval" }
 rustc_const_math = { path = "../librustc_const_math" }
diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 test = false
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 syntax = { path = "../libsyntax" }
 rustc = { path = "../librustc" }
 arena = { path = "../libarena" }
diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml
@@ -9,7 +9,7 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 rustc = { path = "../librustc" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_typeck = { path = "../librustc_typeck" }
diff --git a/src/librustc_trans/Cargo.toml b/src/librustc_trans/Cargo.toml
@@ -13,7 +13,7 @@ test = false
 bitflags = "1.0"
 flate2 = "1.0"
 jobserver = "0.1.5"
-log = "0.3"
+log = "0.4"
 num_cpus = "1.0"
 rustc = { path = "../librustc" }
 rustc-demangle = "0.1.4"
diff --git a/src/librustc_trans_utils/Cargo.toml b/src/librustc_trans_utils/Cargo.toml
@@ -12,7 +12,7 @@ test = false
 [dependencies]
 ar = "0.3.0"
 flate2 = "1.0"
-log = "0.3"
+log = "0.4"
 
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["dylib"]
 test = false
 
 [dependencies]
-log = "0.3"
+log = "0.4"
 syntax = { path = "../libsyntax" }
 arena = { path = "../libarena" }
 fmt_macros = { path = "../libfmt_macros" }
diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
 [dependencies]
 bitflags = "1.0"
 serialize = { path = "../libserialize" }
-log = "0.3"
+log = "0.4"
 syntax_pos = { path = "../libsyntax_pos" }
 rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
 rustc_errors = { path = "../librustc_errors" }
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
@@ -8,7 +8,7 @@ diff = "0.1.10"
 env_logger = { version = "0.4", default-features = false }
 filetime = "0.1"
 getopts = "0.2"
-log = "0.3"
+log = "0.4"
 regex = "0.2"
 rustc-serialize = "0.3"
 

Original file line number	Diff line number	Diff line change
`@@ -253,14 +253,14 @@ pub fn compile_input(sess: &Session,`
`253`	`253`
`254`	`254`	`result?;`
`255`	`255`
`256`		`- if log_enabled!(::log::LogLevel::Info) {`
	`256`	`+ if log_enabled!(::log::Level::Info) {`
`257`	`257`	`println!("Pre-trans");`
`258`	`258`	`tcx.print_debug_stats();`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`let trans = phase_4_translate_to_llvm::<DefaultTransCrate>(tcx, rx);`
`262`	`262`
`263`		`- if log_enabled!(::log::LogLevel::Info) {`
	`263`	`+ if log_enabled!(::log::Level::Info) {`
`264`	`264`	`println!("Post-trans");`
`265`	`265`	`tcx.print_debug_stats();`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1051,7 +1051,7 @@ impl<'a> middle::cstore::CrateLoader for CrateLoader<'a> {`
`1051`	`1051`	`self.inject_allocator_crate(krate);`
`1052`	`1052`	`self.inject_panic_runtime(krate);`
`1053`	`1053`
`1054`		`- if log_enabled!(log::LogLevel::Info) {`
	`1054`	`+ if log_enabled!(log::Level::Info) {`
`1055`	`1055`	`dump_crates(&self.cstore);`
`1056`	`1056`	`}`
`1057`	`1057`	`}`
Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {`
`781`	`781`	`}`
`782`	`782`	`}`
`783`	`783`
`784`		`- if log_enabled!(::log::LogLevel::Trace) {`
	`784`	`+ if log_enabled!(::log::Level::Trace) {`
`785`	`785`	`self.dump_local(dest);`
`786`	`786`	`}`
`787`	`787`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> EvalContext<'a, 'tcx, M> {`
`209`	`209`	`}`
`210`	`210`	`};`
`211`	`211`
`212`		`- if log_enabled!(::log::LogLevel::Trace) {`
	`212`	`+ if log_enabled!(::log::Level::Trace) {`
`213`	`213`	`self.dump_local(place);`
`214`	`214`	`}`
`215`	`215`