46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
diff -up skim-0.6.6/Cargo.toml.bump_env_logger skim-0.6.6/Cargo.toml
|
|
--- skim-0.6.6/Cargo.toml.bump_env_logger 2019-04-14 15:27:10.000000000 +0200
|
|
+++ skim-0.6.6/Cargo.toml 2019-04-14 15:27:55.997046254 +0200
|
|
@@ -46,7 +46,7 @@ version = "2.26.2"
|
|
version = "0.7.1"
|
|
|
|
[dependencies.env_logger]
|
|
-version = "0.4.3"
|
|
+version = "0.6.1"
|
|
|
|
[dependencies.fuzzy-matcher]
|
|
version = "0.2.1"
|
|
diff -up skim-0.6.6/src/main.rs.bump_env_logger skim-0.6.6/src/main.rs
|
|
--- skim-0.6.6/src/main.rs.bump_env_logger 2019-04-14 15:27:10.000000000 +0200
|
|
+++ skim-0.6.6/src/main.rs 2019-04-14 16:59:10.765065637 +0200
|
|
@@ -101,11 +101,14 @@ Usage: sk [options]
|
|
|
|
fn main() {
|
|
use env_logger::Builder;
|
|
+ use env_logger::fmt::Formatter;
|
|
use log::{LevelFilter, Record};
|
|
+ use std::io::Write;
|
|
|
|
- let format = |record: &Record| {
|
|
+ let format = |buf: &mut Formatter, record: &Record| {
|
|
let t = time::now();
|
|
- format!(
|
|
+ writeln!(
|
|
+ buf,
|
|
"{},{:03} - {} - {}",
|
|
time::strftime("%Y-%m-%d %H:%M:%S", &t).expect("main: time format error"),
|
|
t.tm_nsec / 1_000_000,
|
|
@@ -118,10 +121,10 @@ fn main() {
|
|
builder.format(format).filter(None, LevelFilter::Info);
|
|
|
|
if env::var("RUST_LOG").is_ok() {
|
|
- builder.parse(&env::var("RUST_LOG").unwrap());
|
|
+ builder.parse_filters(&env::var("RUST_LOG").unwrap());
|
|
}
|
|
|
|
- builder.init().expect("failed to initialize logger builder");
|
|
+ builder.try_init().expect("failed to initialize logger builder");
|
|
|
|
let exit_code = real_main();
|
|
std::process::exit(exit_code);
|