Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Tokio to use std::future. #1120

Merged
merged 27 commits into from
Jun 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9eb3048
wip
carllerche May 30, 2019
5f88adf
Update tokio-executor
carllerche May 31, 2019
f5f705c
Merge branch 'master' into std-future
carllerche May 31, 2019
e69e136
wip
carllerche May 31, 2019
0b58009
wip
carllerche May 31, 2019
79f5317
Update AtomicWaker (previously AtomicTask)
carllerche May 31, 2019
35f8514
Start updating watch
carllerche Jun 1, 2019
417e962
Update sync::watch and tokio-futures
carllerche Jun 1, 2019
c3ac2cc
More work on updating oneshot tests
carllerche Jun 3, 2019
9f9222d
Update oneshot tests (#1121)
carllerche Jun 3, 2019
2c681e2
Change Executor trait to receive Pin<Box<dyn Future>>
seanmonstar Jun 4, 2019
68f14fc
Refactor tokio-current-thread to use std::future
seanmonstar Jun 4, 2019
c768196
Refactor tokio-io to use std::future and Pins (#1124)
seanmonstar Jun 5, 2019
f6d97d1
Merge branch 'master' into std-future
carllerche Jun 5, 2019
a30af2e
Refactor reactor to use std::future
seanmonstar Jun 5, 2019
b5f3b5d
Refactor tokio-tcp to use std::future (#1131)
seanmonstar Jun 6, 2019
6192ea3
Refactor 'tokio' crate to use std::future
seanmonstar Jun 5, 2019
c5c379c
Refactor tokio-timer to use std::future (#1137)
seanmonstar Jun 6, 2019
1f08354
Finish updating tokio-sync (#1130)
carllerche Jun 7, 2019
4b2d4f0
Remove async-await-preview feature flag (#1141)
carllerche Jun 10, 2019
9810aa4
Merge remote-tracking branch 'origin/master' into std-future
carllerche Jun 10, 2019
5af63d2
Remove `mio` dependency from `tokio` (#1142)
carllerche Jun 11, 2019
aa1fa50
Implement AsyncRead and AsyncWrite for Boxed trait objects (#1144)
seanmonstar Jun 11, 2019
497a411
io: prune all code except AsyncRead and AsyncWrite (#1164)
carllerche Jun 19, 2019
91f04f0
Re-enable cirrus CI (#1176)
carllerche Jun 24, 2019
714f50b
Merge remote-tracking branch 'origin/master' into std-future
carllerche Jun 24, 2019
ff2b1b0
Bump CI
carllerche Jun 24, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ task:
setup_script:
- pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh -y
- sh rustup.sh -y --default-toolchain nightly
- . $HOME/.cargo/env
- rustup target add i686-unknown-freebsd
- |
Expand All @@ -31,13 +31,14 @@ task:
folder: $HOME/.cargo/registry
test_script:
- . $HOME/.cargo/env
- cargo test --all
- cargo test --all --lib && cargo test --all --tests
- (cd tokio-trace/test-log-support && cargo test)
- (cd tokio-trace/test_static_max_level_features && cargo test)
- cargo doc --all
i686_test_script:
- . $HOME/.cargo/env
- |
cargo test --all --exclude tokio-tls --exclude tokio-macros --target i686-unknown-freebsd
# TODO: Re-enable
# i686_test_script:
# - . $HOME/.cargo/env
# - |
# cargo test --all --exclude tokio-tls --exclude tokio-macros --target i686-unknown-freebsd
before_cache_script:
- rm -rf $HOME/.cargo/registry/index
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

members = [
"tokio",
"tokio-buf",
"tokio-codec",
# "tokio-buf",
# "tokio-codec",
"tokio-current-thread",
"tokio-executor",
"tokio-fs",
# "tokio-fs",
"tokio-futures",
"tokio-io",
"tokio-macros",
# "tokio-macros",
"tokio-reactor",
"tokio-signal",
# "tokio-signal",
"tokio-sync",
"tokio-test",
"tokio-threadpool",
# "tokio-threadpool",
"tokio-timer",
"tokio-tcp",
"tokio-tls",
"tokio-trace",
"tokio-trace/tokio-trace-core",
"tokio-udp",
"tokio-uds",
# "tokio-tls",
# "tokio-trace",
# "tokio-trace/tokio-trace-core",
# "tokio-udp",
# "tokio-uds",
]
2 changes: 0 additions & 2 deletions async-await/.cargo/config

This file was deleted.

31 changes: 0 additions & 31 deletions async-await/Cargo.toml

This file was deleted.

5 changes: 0 additions & 5 deletions async-await/README.md

This file was deleted.

131 changes: 0 additions & 131 deletions async-await/src/chat.rs

This file was deleted.

50 changes: 0 additions & 50 deletions async-await/src/echo_client.rs

This file was deleted.

42 changes: 0 additions & 42 deletions async-await/src/echo_server.rs

This file was deleted.

29 changes: 0 additions & 29 deletions async-await/src/hyper.rs

This file was deleted.

22 changes: 0 additions & 22 deletions async-await/tests/macros.rs

This file was deleted.

Loading