Skip to content

Commit 5576c6c

Browse files
authored
Merge pull request #615 from immunant/kkysen/fix-logging-regression
Fix logging regression (no logs)
2 parents 898e2da + d7508f9 commit 5576c6c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

c2rust-transpile/src/diagnostics.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use colored::Colorize;
22
use failure::{err_msg, Backtrace, Context, Error, Fail};
33
use fern::colors::ColoredLevelConfig;
4-
use log::Level;
4+
use log::{Level, SetLoggerError};
55
use std::collections::HashSet;
66
use std::fmt::{self, Display};
77
use std::io;
@@ -32,7 +32,7 @@ pub fn init(mut enabled_warnings: HashSet<Diagnostic>, log_level: log::LevelFilt
3232
enabled_warnings.extend(DEFAULT_WARNINGS.iter().cloned());
3333

3434
let colors = ColoredLevelConfig::new();
35-
let (_log_level, logger) = fern::Dispatch::new()
35+
let (max_level, logger) = fern::Dispatch::new()
3636
.format(move |out, message, record| {
3737
let level_label = match record.level() {
3838
Level::Error => "error",
@@ -64,7 +64,10 @@ pub fn init(mut enabled_warnings: HashSet<Diagnostic>, log_level: log::LevelFilt
6464
})
6565
.chain(io::stderr())
6666
.into_log();
67+
// Ignore the [`SetLoggerError`] b/c we just want to make sure it's set at least once.
68+
let _: Result<(), SetLoggerError> = log_reroute::init();
6769
log_reroute::reroute_boxed(logger);
70+
log::set_max_level(max_level);
6871
}
6972

7073
#[derive(Debug, Clone)]

0 commit comments

Comments
 (0)