Commit e812663

authored

Merge pull request #882 from Keruspe/tokio-fix

fix tokio compatibility

2 parents 4de2d12 + 3e94498 commit e812663Copy full SHA for e812663

File tree

-46

lines changed

-46

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ alloc = [`
`57`	`57`	`"futures-core/alloc",`
`58`	`58`	`"pin-project-lite",`
`59`	`59`	`]`
`60`		`-tokio02 = ["tokio"]`
	`60`	`+tokio02 = ["async-global-executor/tokio02"]`
`61`	`61`
`62`	`62`	`[dependencies]`
`63`	`63`	`async-attributes = { version = "1.1.1", optional = true }`
`@@ -78,7 +78,7 @@ slab = { version = "0.4.2", optional = true }`
`78`	`78`	`surf = { version = "1.0.3", optional = true }`
`79`	`79`
`80`	`80`	`[target.'cfg(not(target_os = "unknown"))'.dependencies]`
`81`		`-async-global-executor = { version = "1.0.2", optional = true, features = ["async-io"] }`
	`81`	`+async-global-executor = { version = "1.2.1", optional = true, features = ["async-io"] }`
`82`	`82`	`async-io = { version = "1.0.1", optional = true }`
`83`	`83`	`blocking = { version = "1.0.0", optional = true }`
`84`	`84`	`futures-lite = { version = "1.0.0", optional = true }`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ impl Builder {`
`168`	`168`	`TaskLocalsWrapper::set_current(&wrapped.tag, \|\| {`
`169`	`169`	`let res = if should_run {`
`170`	`170`	`// The first call should run the executor`
`171`		`- crate::task::executor::run(wrapped)`
	`171`	`+ async_global_executor::block_on(wrapped)`
`172`	`172`	`} else {`
`173`	`173`	`futures_lite::future::block_on(wrapped)`
`174`	`174`	`};`

Lines changed: 0 additions & 41 deletions

This file was deleted.

Lines changed: 0 additions & 2 deletions

Comments

(0)