From e1e34049462cb12ac4e60b8065580122de3005c3 Mon Sep 17 00:00:00 2001 From: sevki Date: Tue, 28 May 2024 14:20:05 +0100 Subject: [PATCH] fix re-exports --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- ok_macros/Cargo.toml | 2 +- src/lib.rs | 13 +++++++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de59dfc..9874ed6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "ok_macros" -version = "0.1.4" +version = "0.1.5" dependencies = [ "darling", "proc-macro2", @@ -697,7 +697,7 @@ dependencies = [ [[package]] name = "okstd" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "backtrace", diff --git a/Cargo.toml b/Cargo.toml index 2554709..93b0d1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "okstd" -version = "0.1.4" +version = "0.1.5" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ok_macros/Cargo.toml b/ok_macros/Cargo.toml index 11cc8c1..6ae95db 100644 --- a/ok_macros/Cargo.toml +++ b/ok_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ok_macros" -version = "0.1.4" +version = "0.1.5" edition = "2021" diff --git a/src/lib.rs b/src/lib.rs index 6a287ab..c033490 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ pub mod notokpanic; mod e2e_tests; extern crate fern; +extern crate log as rustlog; pub mod prelude { pub use crate::okasync::*; @@ -17,13 +18,13 @@ pub mod prelude { pub use super::main; // re-export the slog macros pub use fern::*; - pub use log::debug; - pub use log::error; - pub use log::info; - pub use log::trace; - pub use log::warn; + pub use rustlog::debug; + pub use rustlog::error; + pub use rustlog::info; + pub use rustlog::trace; + pub use rustlog::warn; - pub use log::LevelFilter; + pub use rustlog::LevelFilter; pub use std::panic::set_hook;