Skip to content

Commit 2e134c1

Browse files
committed
Use log 0.4 and env_logger 0.5
1 parent 64d9424 commit 2e134c1

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

Cargo.lock

Lines changed: 2 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/rust-lang-nursery/docs.rs"
88
build = "build.rs"
99

1010
[dependencies]
11-
log = "0.3"
11+
log = "0.4"
1212
rustc-serialize = "0.3"
1313
regex = "1"
1414
clap = "2"
@@ -18,7 +18,7 @@ time = "0.1"
1818
reqwest = "0.9"
1919
semver = "0.9"
2020
slug = "=0.1.1"
21-
env_logger = "0.4"
21+
env_logger = "0.5"
2222
magic = "0.12"
2323
r2d2 = "0.8"
2424
r2d2_postgres = "0.14"

src/bin/cratesfyi.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,18 @@ pub fn main() {
233233

234234

235235
fn logger_init() {
236-
let format = |record: &log::LogRecord| {
237-
format!("{} [{}] {}: {}",
236+
use std::io::Write;
237+
238+
let format = |buf: &mut env_logger::Formatter, record: &log::Record| {
239+
writeln!(buf, "{} [{}] {}: {}",
238240
time::now().strftime("%Y/%m/%d %H:%M:%S").unwrap(),
239241
record.level(),
240242
record.target(),
241243
record.args())
242244
};
243245

244-
let mut builder = env_logger::LogBuilder::new();
246+
let mut builder = env_logger::Builder::new();
245247
builder.format(format);
246248
builder.parse(&env::var("RUST_LOG").unwrap_or("cratesfyi=info".to_owned()));
247-
builder.init().unwrap();
249+
builder.init();
248250
}

src/docbuilder/metadata.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ mod test {
141141

142142
#[test]
143143
fn test_cratesfyi_metadata() {
144-
let _ = env_logger::init();
144+
let _ = env_logger::try_init();
145145
let manifest = r#"
146146
[package]
147147
name = "test"

0 commit comments

Comments
 (0)