env_logger: 0.4.* -> 0.5.0-rc.1
This commit is contained in:
parent
0aba7d2939
commit
c45130ddd0
14 changed files with 14 additions and 18 deletions
|
@ -32,7 +32,7 @@ libimagutil = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
toml-query = "0.6"
|
toml-query = "0.6"
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
[dev-dependencies.libimagutil]
|
[dev-dependencies.libimagutil]
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
|
|
|
@ -273,8 +273,7 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
use env_logger;
|
let _ = ::env_logger::try_init();
|
||||||
let _ = env_logger::init().unwrap_or(());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = ">=2.17"
|
clap = ">=2.17"
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
toml = "0.4"
|
toml = "0.4"
|
||||||
xdg-basedir = "1.0"
|
xdg-basedir = "1.0"
|
||||||
itertools = "0.7"
|
itertools = "0.7"
|
||||||
|
|
|
@ -340,7 +340,7 @@ impl<'a> Runtime<'a> {
|
||||||
use env_logger;
|
use env_logger;
|
||||||
|
|
||||||
if env_var("IMAG_LOG_ENV").is_ok() {
|
if env_var("IMAG_LOG_ENV").is_ok() {
|
||||||
env_logger::init().unwrap();
|
let _ = env_logger::try_init();
|
||||||
} else {
|
} else {
|
||||||
let logger = ImagLogger::new(matches, config)
|
let logger = ImagLogger::new(matches, config)
|
||||||
.map_err_trace()
|
.map_err_trace()
|
||||||
|
|
|
@ -39,7 +39,7 @@ libimagutil = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempdir = "0.3"
|
tempdir = "0.3"
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = []
|
default = []
|
||||||
|
|
|
@ -30,5 +30,5 @@ libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
||||||
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
|
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
|
|
|
@ -175,7 +175,7 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_creating_category_creates_store_entry_with_header_field_set() {
|
fn test_creating_category_creates_store_entry_with_header_field_set() {
|
||||||
let _ = env_logger::init();
|
let _ = env_logger::try_init();
|
||||||
let category_name = "examplecategory";
|
let category_name = "examplecategory";
|
||||||
let store = get_store();
|
let store = get_store();
|
||||||
let res = store.create_category(category_name);
|
let res = store.create_category(category_name);
|
||||||
|
|
|
@ -26,5 +26,5 @@ libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
|
||||||
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
|
|
|
@ -108,8 +108,7 @@ mod tests {
|
||||||
use entry::*;
|
use entry::*;
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
use env_logger;
|
let _ = ::env_logger::try_init;
|
||||||
let _ = env_logger::init().unwrap_or(());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_store() -> Store {
|
fn get_store() -> Store {
|
||||||
|
|
|
@ -34,5 +34,5 @@ libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
||||||
libimagutil = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
|
libimagutil = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
|
|
|
@ -411,7 +411,7 @@ mod tests {
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
use env_logger;
|
use env_logger;
|
||||||
let _ = env_logger::init().unwrap_or(());
|
let _ = env_logger::try_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_store() -> Store {
|
pub fn get_store() -> Store {
|
||||||
|
|
|
@ -767,8 +767,7 @@ mod test {
|
||||||
use super::Link;
|
use super::Link;
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
use env_logger;
|
let _ = ::env_logger::try_init();
|
||||||
let _ = env_logger::init().unwrap_or(());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_store() -> Store {
|
pub fn get_store() -> Store {
|
||||||
|
|
|
@ -24,7 +24,7 @@ log = "0.4.0-rc.1"
|
||||||
hoedown = "6.0.0"
|
hoedown = "6.0.0"
|
||||||
url = "1.5"
|
url = "1.5"
|
||||||
error-chain = "0.11"
|
error-chain = "0.11"
|
||||||
env_logger = "0.4"
|
env_logger = "0.5.0-rc.1"
|
||||||
|
|
||||||
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
|
libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
|
||||||
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
|
||||||
|
|
|
@ -218,8 +218,7 @@ mod tests {
|
||||||
use libimagentrylink::internal::InternalLinker;
|
use libimagentrylink::internal::InternalLinker;
|
||||||
|
|
||||||
fn setup_logging() {
|
fn setup_logging() {
|
||||||
use env_logger;
|
let _ = ::env_logger::try_init();
|
||||||
let _ = env_logger::init().unwrap_or(());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_store() -> Store {
|
pub fn get_store() -> Store {
|
||||||
|
|
Loading…
Reference in a new issue