Skip to content

Commit

Permalink
Rollup merge of rust-lang#60401 - JohnTitor:rename-log, r=davidtwco
Browse files Browse the repository at this point in the history
Rename `RUST_LOG` to `RUSTC_LOG`

cc: rust-lang#57985

I think we should also change these submodules:

- rustc-guide
- Cargo (rename to `CARGO_LOG`, cc: rust-lang/cargo#6605, rust-lang/cargo#6189)
- miri
- rls
- rustfmt

r? @davidtwco
  • Loading branch information
Centril authored May 3, 2019
2 parents 3e536e8 + bf4d0ad commit bfa22cf
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ fn configure_cmake(builder: &Builder<'_>,
}

if env::var_os("SCCACHE_ERROR_LOG").is_some() {
cfg.env("RUST_LOG", "sccache=warn");
cfg.env("RUSTC_LOG", "sccache=warn");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustc/infer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
/// potentially leaving "dangling type variables" behind.
/// In such cases, an assertion will fail when attempting to
/// register obligations, within a snapshot. Very useful, much
/// better than grovelling through megabytes of `RUST_LOG` output.
/// better than grovelling through megabytes of `RUSTC_LOG` output.
///
/// HOWEVER, in some cases the flag is unhelpful. In particular, we
/// sometimes create a "mini-fulfilment-cx" in which we enroll
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_driver/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ pub fn report_ices_to_stderr_if_any<F: FnOnce() -> R, R>(f: F) -> Result<R, Erro
/// This allows tools to enable rust logging without having to magically match rustc's
/// log crate version
pub fn init_rustc_env_logger() {
env_logger::init();
env_logger::init_from_env("RUSTC_LOG");
}

pub fn main() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-make-fulldeps/libs-through-symlinks/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ all:
mkdir -p $(TMPDIR)/outdir
$(RUSTC) foo.rs -o $(TMPDIR)/outdir/$(NAME)
ln -nsf outdir/$(NAME) $(TMPDIR)
RUST_LOG=rustc_metadata::loader $(RUSTC) bar.rs
RUSTC_LOG=rustc_metadata::loader $(RUSTC) bar.rs
2 changes: 1 addition & 1 deletion src/test/run-pass/issues/issue-18075.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// run-pass
// exec-env:RUST_LOG=rustc::middle=debug
// exec-env:RUSTC_LOG=rustc::middle=debug

fn main() {
let b = 1isize;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/logging-only-prints-once.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ignore-windows
// ignore-emscripten no threads support
// exec-env:RUST_LOG=debug
// exec-env:RUSTC_LOG=debug

use std::cell::Cell;
use std::fmt;
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/logging_before_rt_started.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// exec-env:RUST_LOG=std::ptr
// exec-env:RUSTC_LOG=std::ptr

// In issue #9487, it was realized that std::ptr was invoking the logging
// infrastructure, and when std::ptr was used during runtime initialization,
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/rustc-rust-log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
// dont-check-compiler-stderr
// compile-flags: --error-format human

// rustc-env:RUST_LOG=debug
// rustc-env:RUSTC_LOG=debug

fn main() {}
2 changes: 1 addition & 1 deletion src/test/run-pass/threads-sendsync/spawning-with-debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![allow(unused_must_use)]
#![allow(unused_mut)]
// ignore-windows
// exec-env:RUST_LOG=debug
// exec-env:RUSTC_LOG=debug
// ignore-emscripten no threads support

// regression test for issue #10405, make sure we don't call println! too soon.
Expand Down

0 comments on commit bfa22cf

Please sign in to comment.