Commit c7cf193

authored

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

upgrade log, remove kv-log-macro

2 parents 37d8a01 + b7e5576 commit c7cf193Copy full SHA for c7cf193

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ default = [`
`27`	`27`	`"crossbeam-channel",`
`28`	`28`	`"crossbeam-deque",`
`29`	`29`	`"futures-timer",`
`30`		`- "kv-log-macro",`
`31`	`30`	`"log",`
`32`	`31`	`"mio",`
`33`	`32`	`"mio-uds",`
`@@ -58,8 +57,7 @@ crossbeam-utils = { version = "0.7.0", optional = true }`
`58`	`57`	`futures-core = { version = "0.3.1", optional = true }`
`59`	`58`	`futures-io = { version = "0.3.1", optional = true }`
`60`	`59`	`futures-timer = { version = "2.0.2", optional = true }`
`61`		`-kv-log-macro = { version = "1.0.4", optional = true }`
`62`		`-log = { version = "0.4.8", features = ["kv_unstable"], optional = true }`
	`60`	`+log = { version = "0.4.10", features = ["kv_unstable"], optional = true }`
`63`	`61`	`memchr = { version = "2.2.1", optional = true }`
`64`	`62`	`mio = { version = "0.6.19", optional = true }`
`65`	`63`	`mio-uds = { version = "0.6.7", optional = true }`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ use std::task::{RawWaker, RawWakerVTable};`
`6`	`6`	`use std::thread;`
`7`	`7`
`8`	`8`	`use crossbeam_utils::sync::Parker;`
`9`		`-use kv_log_macro::trace;`
`10`	`9`	`use log::log_enabled;`
`11`	`10`
`12`	`11`	`use crate::task::{Context, Poll, Task, Waker};`
`@@ -43,7 +42,7 @@ where`
`43`	`42`
`44`	`43`	// Log this `block_on` operation.
`45`	`44`	`if log_enabled!(log::Level::Trace) {`
`46`		`- trace!("block_on", {`
	`45`	`+ log::trace!("block_on", {`
`47`	`46`	`task_id: task.id().0,`
`48`	`47`	`parent_task_id: Task::get_current(\|t\| t.id().0).unwrap_or(0),`
`49`	`48`	`});`
`@@ -59,7 +58,7 @@ where`
`59`	`58`	`defer! {`
`60`	`59`	`if log_enabled!(log::Level::Trace) {`
`61`	`60`	`Task::get_current(\|t\| {`
`62`		`- trace!("completed", {`
	`61`	`+ log::trace!("completed", {`
`63`	`62`	`task_id: t.id().0,`
`64`	`63`	`});`
`65`	`64`	`});`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use kv_log_macro::trace;`
`2`	`1`	`use log::log_enabled;`
`3`	`2`	`use std::future::Future;`
`4`	`3`
`@@ -38,7 +37,7 @@ impl Builder {`
`38`	`37`
`39`	`38`	// Log this `spawn` operation.
`40`	`39`	`if log_enabled!(log::Level::Trace) {`
`41`		`- trace!("spawn", {`
	`40`	`+ log::trace!("spawn", {`
`42`	`41`	`task_id: task.id().0,`
`43`	`42`	`parent_task_id: Task::get_current(\|t\| t.id().0).unwrap_or(0),`
`44`	`43`	`});`
`@@ -54,7 +53,7 @@ impl Builder {`
`54`	`53`	`defer! {`
`55`	`54`	`if log_enabled!(log::Level::Trace) {`
`56`	`55`	`Task::get_current(\|t\| {`
`57`		`- trace!("completed", {`
	`56`	`+ log::trace!("completed", {`
`58`	`57`	`task_id: t.id().0,`
`59`	`58`	`});`
`60`	`59`	`});`

Comments

(0)