mirror/async-std
2
0
Fork 1
mirror of https://github.com/async-rs/async-std.git synced 2025-03-01 07:39:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #629 from async-rs/update-log

Browse source 
upgrade log, remove kv-log-macro
This commit is contained in:
Florian Gilcher 2019-12-17 22:05:51 +01:00 committed by GitHub
commit c7cf1934db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -27,7 +27,6 @@ default = [
"crossbeam-channel",
"crossbeam-deque",
"futures-timer",
"kv-log-macro",
"log",
"mio",
"mio-uds",
@ -58,8 +57,7 @@ crossbeam-utils = { version = "0.7.0", optional = true }
futures-core = { version = "0.3.1", optional = true }
futures-io = { version = "0.3.1", optional = true }
futures-timer = { version = "2.0.2", optional = true }
kv-log-macro = { version = "1.0.4", optional = true }
log = { version = "0.4.8", features = ["kv_unstable"], optional = true }
log = { version = "0.4.10", features = ["kv_unstable"], optional = true }
memchr = { version = "2.2.1", optional = true }
mio = { version = "0.6.19", optional = true }
mio-uds = { version = "0.6.7", optional = true }

5
src/task/block_on.rs
View file

@ -6,7 +6,6 @@ use std::task::{RawWaker, RawWakerVTable};
use std::thread;
use crossbeam_utils::sync::Parker;
use kv_log_macro::trace;
use log::log_enabled;
use crate::task::{Context, Poll, Task, Waker};
@ -43,7 +42,7 @@ where
// Log this `block_on` operation.
if log_enabled!(log::Level::Trace) {
trace!("block_on", {
log::trace!("block_on", {
task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
});
@ -59,7 +58,7 @@ where
defer! {
if log_enabled!(log::Level::Trace) {
Task::get_current(|t| {
trace!("completed", {
log::trace!("completed", {
task_id: t.id().0,
});
});

5
src/task/builder.rs
View file

@ -1,4 +1,3 @@
use kv_log_macro::trace;
use log::log_enabled;
use std::future::Future;
@ -38,7 +37,7 @@ impl Builder {
// Log this `spawn` operation.
if log_enabled!(log::Level::Trace) {
trace!("spawn", {
log::trace!("spawn", {
task_id: task.id().0,
parent_task_id: Task::get_current(|t| t.id().0).unwrap_or(0),
});
@ -54,7 +53,7 @@ impl Builder {
defer! {
if log_enabled!(log::Level::Trace) {
Task::get_current(|t| {
trace!("completed", {
log::trace!("completed", {
task_id: t.id().0,
});
});