diff options
author | Carl Lerche <me@carllerche.com> | 2019-10-25 12:50:15 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 12:50:15 -0700 |
commit | 227533d456fe32e48ffcd3796f1e6c8f9318b230 (patch) | |
tree | 498029aaf42dd64eeb8ef0e7d7f29802b45d4e95 | |
parent | 03a9378297c73c2e56a6d6b55db22b92427b850a (diff) |
net: move into tokio crate (#1683)
A step towards collapsing Tokio sub crates into a single `tokio`
crate (#1318).
The `net` implementation is now provided by the main `tokio` crate.
Functionality can be opted out of by using the various net related
feature flags.
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | azure-pipelines.yml | 38 | ||||
-rw-r--r-- | build-tests/Cargo.toml | 27 | ||||
-rw-r--r-- | build-tests/tests/fail/executor_without_current_thread.rs | 3 | ||||
-rw-r--r-- | build-tests/tests/fail/net_without_tcp_missing_tcp.rs | 4 | ||||
-rw-r--r-- | build-tests/tests/fail/net_without_udp_missing_udp.rs | 4 | ||||
-rw-r--r-- | build-tests/tests/fail/net_without_uds_missing_uds.rs | 4 | ||||
-rw-r--r-- | build-tests/tests/fail/tokio_without_net_missing_net.rs | 3 | ||||
-rw-r--r-- | ci/azure-loom.yml | 2 | ||||
-rw-r--r-- | ci/patch.toml | 1 | ||||
-rw-r--r-- | tests-build/Cargo.toml | 26 | ||||
-rw-r--r-- | tests-build/README.md (renamed from build-tests/README.md) | 0 | ||||
-rw-r--r-- | tests-build/src/lib.rs (renamed from build-tests/src/lib.rs) | 0 | ||||
-rw-r--r-- | tests-build/tests/fail/executor_without_current_thread.rs | 3 | ||||
-rw-r--r-- | tests-build/tests/fail/executor_without_current_thread.stderr (renamed from build-tests/tests/fail/executor_without_current_thread.stderr) | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/macros_invalid_input.rs (renamed from build-tests/tests/fail/macros_invalid_input.rs) | 2 | ||||
-rw-r--r-- | tests-build/tests/fail/macros_invalid_input.stderr (renamed from build-tests/tests/fail/macros_invalid_input.stderr) | 0 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_tcp_missing_tcp.rs | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_tcp_missing_tcp.stderr (renamed from build-tests/tests/fail/net_without_tcp_missing_tcp.stderr) | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_udp_missing_udp.rs | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_udp_missing_udp.stderr (renamed from build-tests/tests/fail/net_without_udp_missing_udp.stderr) | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_uds_missing_uds.rs | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/net_without_uds_missing_uds.stderr (renamed from build-tests/tests/fail/net_without_uds_missing_uds.stderr) | 4 | ||||
-rw-r--r-- | tests-build/tests/fail/tokio_without_net_missing_net.rs | 3 | ||||
-rw-r--r-- | tests-build/tests/fail/tokio_without_net_missing_net.stderr (renamed from build-tests/tests/fail/tokio_without_net_missing_net.stderr) | 4 | ||||
-rw-r--r-- | tests-build/tests/features.rs (renamed from build-tests/tests/features.rs) | 14 | ||||
-rw-r--r-- | tests-integration/Cargo.toml | 14 | ||||
-rw-r--r-- | tests-integration/README.md | 1 | ||||
-rw-r--r-- | tests-integration/src/bin/test-cat.rs (renamed from tokio-net/src/bin/test-cat.rs) | 0 | ||||
-rw-r--r-- | tests-integration/tests/process_stdio.rs (renamed from tokio-net/tests/process_stdio.rs) | 20 | ||||
-rw-r--r-- | tokio-executor/src/blocking/mod.rs | 7 | ||||
-rw-r--r-- | tokio-net/CHANGELOG.md | 98 | ||||
-rw-r--r-- | tokio-net/Cargo.toml | 109 | ||||
-rw-r--r-- | tokio-net/LICENSE | 25 | ||||
-rw-r--r-- | tokio-net/README.md | 13 | ||||
-rw-r--r-- | tokio-net/src/lib.rs | 63 | ||||
-rw-r--r-- | tokio-net/tests/signal_simple.rs | 36 | ||||
-rw-r--r-- | tokio-net/tests/support.rs | 34 | ||||
-rw-r--r-- | tokio-tls/Cargo.toml | 1 | ||||
-rw-r--r-- | tokio/Cargo.toml | 61 | ||||
-rw-r--r-- | tokio/src/lib.rs | 16 | ||||
-rw-r--r-- | tokio/src/net.rs | 67 | ||||
-rw-r--r-- | tokio/src/net/addr.rs (renamed from tokio-net/src/addr.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/driver/mod.rs (renamed from tokio-net/src/driver/mod.rs) | 1 | ||||
-rw-r--r-- | tokio/src/net/driver/platform.rs (renamed from tokio-net/src/driver/platform.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/driver/reactor.rs (renamed from tokio-net/src/driver/reactor.rs) | 15 | ||||
-rw-r--r-- | tokio/src/net/driver/registration.rs (renamed from tokio-net/src/driver/registration.rs) | 2 | ||||
-rw-r--r-- | tokio/src/net/driver/sharded_rwlock.rs (renamed from tokio-net/src/driver/sharded_rwlock.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/mod.rs | 47 | ||||
-rw-r--r-- | tokio/src/net/tcp/incoming.rs (renamed from tokio-net/src/tcp/incoming.rs) | 4 | ||||
-rw-r--r-- | tokio/src/net/tcp/listener.rs (renamed from tokio-net/src/tcp/listener.rs) | 10 | ||||
-rw-r--r-- | tokio/src/net/tcp/mod.rs (renamed from tokio-net/src/tcp/mod.rs) | 10 | ||||
-rw-r--r-- | tokio/src/net/tcp/split.rs (renamed from tokio-net/src/tcp/split.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/tcp/stream.rs (renamed from tokio-net/src/tcp/stream.rs) | 7 | ||||
-rw-r--r-- | tokio/src/net/udp/mod.rs (renamed from tokio-net/src/udp/mod.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/udp/socket.rs (renamed from tokio-net/src/udp/socket.rs) | 7 | ||||
-rw-r--r-- | tokio/src/net/udp/split.rs (renamed from tokio-net/src/udp/split.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/unix/datagram.rs (renamed from tokio-net/src/uds/datagram.rs) | 3 | ||||
-rw-r--r-- | tokio/src/net/unix/incoming.rs (renamed from tokio-net/src/uds/incoming.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/unix/listener.rs (renamed from tokio-net/src/uds/listener.rs) | 4 | ||||
-rw-r--r-- | tokio/src/net/unix/mod.rs (renamed from tokio-net/src/uds/mod.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/unix/split.rs (renamed from tokio-net/src/uds/split.rs) | 0 | ||||
-rw-r--r-- | tokio/src/net/unix/stream.rs (renamed from tokio-net/src/uds/stream.rs) | 6 | ||||
-rw-r--r-- | tokio/src/net/unix/ucred.rs (renamed from tokio-net/src/uds/ucred.rs) | 36 | ||||
-rw-r--r-- | tokio/src/net/util/mod.rs (renamed from tokio-net/src/util/mod.rs) | 1 | ||||
-rw-r--r-- | tokio/src/net/util/poll_evented.rs (renamed from tokio-net/src/util/poll_evented.rs) | 4 | ||||
-rw-r--r-- | tokio/src/process.rs | 2 | ||||
-rw-r--r-- | tokio/src/process/kill.rs (renamed from tokio-net/src/process/kill.rs) | 0 | ||||
-rw-r--r-- | tokio/src/process/mod.rs (renamed from tokio-net/src/process/mod.rs) | 54 | ||||
-rw-r--r-- | tokio/src/process/unix/mod.rs (renamed from tokio-net/src/process/unix/mod.rs) | 2 | ||||
-rw-r--r-- | tokio/src/process/unix/orphan.rs (renamed from tokio-net/src/process/unix/orphan.rs) | 0 | ||||
-rw-r--r-- | tokio/src/process/unix/reap.rs (renamed from tokio-net/src/process/unix/reap.rs) | 0 | ||||
-rw-r--r-- | tokio/src/process/windows.rs (renamed from tokio-net/src/process/windows.rs) | 7 | ||||
-rw-r--r-- | tokio/src/runtime/current_thread/builder.rs | 2 | ||||
-rw-r--r-- | tokio/src/runtime/current_thread/runtime.rs | 2 | ||||
-rw-r--r-- | tokio/src/runtime/mod.rs | 2 | ||||
-rw-r--r-- | tokio/src/runtime/threadpool/builder.rs | 4 | ||||
-rw-r--r-- | tokio/src/runtime/threadpool/mod.rs | 4 | ||||
-rw-r--r-- | tokio/src/signal.rs | 4 | ||||
-rw-r--r-- | tokio/src/signal/ctrl_c.rs (renamed from tokio-net/src/signal/ctrl_c.rs) | 0 | ||||
-rw-r--r-- | tokio/src/signal/mod.rs (renamed from tokio-net/src/signal/mod.rs) | 5 | ||||
-rw-r--r-- | tokio/src/signal/registry.rs (renamed from tokio-net/src/signal/registry.rs) | 155 | ||||
-rw-r--r-- | tokio/src/signal/unix.rs (renamed from tokio-net/src/signal/unix.rs) | 6 | ||||
-rw-r--r-- | tokio/src/signal/windows.rs (renamed from tokio-net/src/signal/windows.rs) | 56 | ||||
-rw-r--r-- | tokio/tests/buffered.rs | 1 | ||||
-rw-r--r-- | tokio/tests/net_bind_resource.rs (renamed from tokio-net/tests/bind_resource.rs) | 13 | ||||
-rw-r--r-- | tokio/tests/net_driver.rs (renamed from tokio/tests/reactor.rs) | 7 | ||||
-rw-r--r-- | tokio/tests/net_driver_drop.rs (renamed from tokio/tests/drop-core.rs) | 3 | ||||
-rw-r--r-- | tokio/tests/process_issue_42.rs (renamed from tokio-net/tests/process_issue_42.rs) | 11 | ||||
-rw-r--r-- | tokio/tests/process_smoke.rs (renamed from tokio-net/tests/process_smoke.rs) | 10 | ||||
-rw-r--r-- | tokio/tests/signal_ctrl_c.rs | 28 | ||||
-rw-r--r-- | tokio/tests/signal_drop_recv.rs (renamed from tokio-net/tests/signal_drop_then_get_a_signal.rs) | 12 | ||||
-rw-r--r-- | tokio/tests/signal_drop_rt.rs (renamed from tokio-net/tests/signal_drop_multi_loop.rs) | 22 | ||||
-rw-r--r-- | tokio/tests/signal_drop_signal.rs (renamed from tokio-net/tests/signal_dropping_does_not_deregister_other_instances.rs) | 15 | ||||
-rw-r--r-- | tokio/tests/signal_multi_rt.rs (renamed from tokio-net/tests/signal_multi_loop.rs) | 15 | ||||
-rw-r--r-- | tokio/tests/signal_no_rt.rs | 10 | ||||
-rw-r--r-- | tokio/tests/signal_notify_both.rs (renamed from tokio-net/tests/signal_notify_both.rs) | 14 | ||||
-rw-r--r-- | tokio/tests/signal_twice.rs (renamed from tokio-net/tests/signal_twice.rs) | 12 | ||||
-rw-r--r-- | tokio/tests/signal_usr1.rs | 23 | ||||
-rw-r--r-- | tokio/tests/support/signal.rs | 7 | ||||
-rw-r--r-- | tokio/tests/tcp_accept.rs (renamed from tokio-net/tests/tcp_accept.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/tcp_connect.rs (renamed from tokio-net/tests/tcp_connect.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/tcp_echo.rs (renamed from tokio-net/tests/tcp_echo.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/tcp_peek.rs (renamed from tokio-net/tests/tcp_peek.rs) | 6 | ||||
-rw-r--r-- | tokio/tests/tcp_shutdown.rs (renamed from tokio-net/tests/tcp_shutdown.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/tcp_split.rs (renamed from tokio-net/tests/tcp_split.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/udp.rs (renamed from tokio-net/tests/udp.rs) | 2 | ||||
-rw-r--r-- | tokio/tests/uds_cred.rs | 29 | ||||
-rw-r--r-- | tokio/tests/uds_datagram.rs (renamed from tokio-net/tests/uds_datagram.rs) | 3 | ||||
-rw-r--r-- | tokio/tests/uds_split.rs (renamed from tokio-net/tests/uds_split.rs) | 0 | ||||
-rw-r--r-- | tokio/tests/uds_stream.rs (renamed from tokio-net/tests/uds_stream.rs) | 10 |
111 files changed, 580 insertions, 870 deletions
@@ -5,7 +5,6 @@ members = [ "tokio-executor", "tokio-io", "tokio-macros", - "tokio-net", "tokio-sync", "tokio-test", "tokio-tls", @@ -13,5 +12,6 @@ members = [ # Internal "examples", - "build-tests", + "tests-build", + "tests-integration", ] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2acdb522..1dad7b1d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ jobs: tokio: - fs - io - - net + - net-driver - process - rt-full - signal @@ -37,21 +37,7 @@ jobs: - timer - udp - uds - -# Test crates that are platform specific -- template: ci/azure-test-stable.yml - parameters: - name: test_sub_cross - displayName: Test sub crates (cross) - - cross: true - rust: beta - crates: - tokio-net: - - process - - signal - - tcp - - udp - - uds + tests-integration: [] # Test crates that are NOT platform specific - template: ci/azure-test-stable.yml @@ -79,21 +65,21 @@ jobs: displayName: Test feature flags rust: beta crates: - build-tests: + tests-build: - tokio-executor - - tokio-net - executor-without-current-thread - - macros-invalid-input - - net-no-features - - net-with-tcp - - net-with-udp - - net-with-uds - - tokio-no-features - - tokio-with-net + # - macros-invalid-input + # - net-no-features + # - net-with-tcp + # - net-with-udp + # - net-with-uds + # - tokio-no-features + # - tokio-with-net # Run loom tests - template: ci/azure-loom.yml parameters: + name: loom rust: beta crates: - tokio-executor @@ -128,9 +114,9 @@ jobs: - rustfmt - clippy - test_tokio - - test_sub_cross - test_linux - test_features + - loom # - test_nightly - cross # - minrust diff --git a/build-tests/Cargo.toml b/build-tests/Cargo.toml deleted file mode 100644 index dfd4f8b4..00000000 --- a/build-tests/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "build-tests" -version = "0.1.0" -authors = ["Tokio Contributors <team@tokio.rs>"] -edition = "2018" -publish = false - -[features] -executor-without-current-thread = ["tokio-executor"] -macros-invalid-input = ["tokio/rt-full"] -net-no-features = ["tokio-net"] -net-with-tcp = ["tokio-net/tcp"] -net-with-udp = ["tokio-net/udp"] -net-with-uds = ["tokio-net/uds"] -net-with-process = ["tokio-net/process"] -tokio-no-features = ["tokio"] -tokio-with-net = ["tokio/net"] - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -tokio-executor = { path = "../tokio-executor", optional = true } -tokio-net = { path = "../tokio-net", optional = true } -tokio = { path = "../tokio", optional = true, default-features = false } - -[dev-dependencies] -trybuild = "1.0" diff --git a/build-tests/tests/fail/executor_without_current_thread.rs b/build-tests/tests/fail/executor_without_current_thread.rs deleted file mode 100644 index 469bd966..00000000 --- a/build-tests/tests/fail/executor_without_current_thread.rs +++ /dev/null @@ -1,3 +0,0 @@ -use build_tests::tokio_executor::current_thread; - -fn main() {} diff --git a/build-tests/tests/fail/net_without_tcp_missing_tcp.rs b/build-tests/tests/fail/net_without_tcp_missing_tcp.rs deleted file mode 100644 index c407e4ab..00000000 --- a/build-tests/tests/fail/net_without_tcp_missing_tcp.rs +++ /dev/null @@ -1,4 +0,0 @@ -use build_tests::tokio_net::tcp; - -fn main() {} - diff --git a/build-tests/tests/fail/net_without_udp_missing_udp.rs b/build-tests/tests/fail/net_without_udp_missing_udp.rs deleted file mode 100644 index 56b726d2..00000000 --- a/build-tests/tests/fail/net_without_udp_missing_udp.rs +++ /dev/null @@ -1,4 +0,0 @@ -use build_tests::tokio_net::udp; - -fn main() {} - diff --git a/build-tests/tests/fail/net_without_uds_missing_uds.rs b/build-tests/tests/fail/net_without_uds_missing_uds.rs deleted file mode 100644 index fb0dece2..00000000 --- a/build-tests/tests/fail/net_without_uds_missing_uds.rs +++ /dev/null @@ -1,4 +0,0 @@ -use build_tests::tokio_net::uds; - -fn main() {} - diff --git a/build-tests/tests/fail/tokio_without_net_missing_net.rs b/build-tests/tests/fail/tokio_without_net_missing_net.rs deleted file mode 100644 index db5debe9..00000000 --- a/build-tests/tests/fail/tokio_without_net_missing_net.rs +++ /dev/null @@ -1,3 +0,0 @@ -use build_tests::tokio::net; - -fn main() {} diff --git a/ci/azure-loom.yml b/ci/azure-loom.yml index c57bc732..c08b68ca 100644 --- a/ci/azure-loom.yml +++ b/ci/azure-loom.yml @@ -1,5 +1,5 @@ jobs: -- job: loom +- job: ${{ parameters.name }} displayName: Loom tests pool: vmImage: ubuntu-16.04 |