Bump tokio MSRV to 1.63 #5887

NobodyXu · 2023-07-22T11:29:28Z

Also

Remove build.rs
Remove build-dependency autocfg.
Bump dependency socket2 to v0.5.3

Motivation

Bumping tokio MSRV to 1.63 will make all features required available and thus removing the need for build.rs.

It will also make {Mutex, Notify, OnceCell, RwLock, Semaphore}::const_new available by default and also make it possible for {Mutex, Notify, OnceCell, RwLock, Semaphore}::new to be usable in const context (#5885).

Solution

Bump tokio MSRV to 1.63

Also cleanup `build.rs` and remove dependency `autocfg`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

README.md

tokio/Cargo.toml

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

tokio/build.rs

README.md

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Replace `tokio_wasi` with `target_os = "wasi"` and replace latter with `cfg_is_wasm_not_wasi!` or `all(target_family = "wasm", not(target_os = "wasi"))`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

NobodyXu · 2023-07-22T13:50:41Z

CI spuriously failed due to same error as #5885 (comment)

--- STDERR:              tokio::rt_threaded_alt many_multishot_futures ---
thread 'tokio-runtime-worker' panicked at 'explicit panic', tokio/src/runtime/scheduler/multi_thread_alt/queue.rs:149:13
stack backtrace:
   0: rust_begin_unwind
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/panicking.rs:593:5
   1: core::panicking::panic_fmt
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/core/src/panicking.rs:67:14
   2: core::panicking::panic
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/core/src/panicking.rs:117:5
   3: tokio::runtime::scheduler::multi_thread_alt::queue::Local<T>::push_back
             at ./src/runtime/scheduler/multi_thread_alt/queue.rs:149:13
   4: tokio::runtime::scheduler::multi_thread_alt::worker::Worker::next_remote_task_batch_synced
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:799:9
   5: tokio::runtime::scheduler::multi_thread_alt::worker::Worker::do_park
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:1154:29
   6: tokio::runtime::scheduler::multi_thread_alt::worker::Worker::park
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:1125:30
   7: tokio::runtime::scheduler::multi_thread_alt::worker::Worker::next_task
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:707:46
   8: tokio::runtime::scheduler::multi_thread_alt::worker::Worker::run
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:570:35
   9: tokio::runtime::scheduler::multi_thread_alt::worker::run::{{closure}}::{{closure}}
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:502:23
  10: tokio::runtime::context::scoped::Scoped<T>::set
             at ./src/runtime/context/scoped.rs:40:9
  11: tokio::runtime::context::set_scheduler::{{closure}}
             at ./src/runtime/context.rs:176:26
  12: std::thread::local::LocalKey<T>::try_with
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/thread/local.rs:270:16
  13: std::thread::local::LocalKey<T>::with
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/thread/local.rs:246:9
  14: tokio::runtime::context::set_scheduler
             at ./src/runtime/context.rs:176:9
  15: tokio::runtime::scheduler::multi_thread_alt::worker::run::{{closure}}
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:498:9
  16: tokio::runtime::context::runtime::enter_runtime
             at ./src/runtime/context/runtime.rs:65:16
  17: tokio::runtime::scheduler::multi_thread_alt::worker::run
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:487:5
  18: tokio::runtime::scheduler::multi_thread_alt::worker::create::{{closure}}
             at ./src/runtime/scheduler/multi_thread_alt/worker.rs:334:49
  19: <tokio::runtime::blocking::task::BlockingTask<T> as core::future::future::Future>::poll
             at ./src/runtime/blocking/task.rs:42:21
  20: <tracing::instrument::Instrumented<T> as core::future::future::Future>::poll
             at /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tracing-0.1.37/src/instrument.rs:272:9
  21: tokio::runtime::task::core::Core<T,S>::poll::{{closure}}
             at ./src/runtime/task/core.rs:334:17
  22: tokio::loom::std::unsafe_cell::UnsafeCell<T>::with_mut
             at ./src/loom/std/unsafe_cell.rs:16:9
  23: tokio::runtime::task::core::Core<T,S>::poll
             at ./src/runtime/task/core.rs:323:13
  24: tokio::runtime::task::harness::poll_future::{{closure}}
             at ./src/runtime/task/harness.rs:485:19
  25: <core::panic::unwind_safe::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/core/src/panic/unwind_safe.rs:271:9
  26: std::panicking::try::do_call
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/panicking.rs:500:40
  27: __rust_try
  28: std::panicking::try
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/panicking.rs:464:19
  29: std::panic::catch_unwind
             at /rustc/8ede3aae28fe6e4d52b38157d7bfe0d3bceef225/library/std/src/panic.rs:142:14
  30: tokio::runtime::task::harness::poll_future
             at ./src/runtime/task/harness.rs:473:18
  31: tokio::runtime::task::harness::Harness<T,S>::poll_inner
             at ./src/runtime/task/harness.rs:208:27
  32: tokio::runtime::task::harness::Harness<T,S>::poll
             at ./src/runtime/task/harness.rs:153:15
  33: tokio::runtime::task::raw::poll
             at ./src/runtime/task/raw.rs:276:5
  34: tokio::runtime::task::raw::RawTask::poll
             at ./src/runtime/task/raw.rs:200:18
  35: tokio::runtime::task::UnownedTask<S>::run
             at ./src/runtime/task/mod.rs:437:9
  36: tokio::runtime::blocking::pool::Task::run
             at ./src/runtime/blocking/pool.rs:159:9
  37: tokio::runtime::blocking::pool::Inner::run
             at ./src/runtime/blocking/pool.rs:513:17
  38: tokio::runtime::blocking::pool::Spawner::spawn_thread::{{closure}}
             at ./src/runtime/blocking/pool.rs:471:13
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
worker thread panicking; aborting process

   Canceling due to test failure: 1 tests still running
        PASS [   0.073s] tokio::rt_threaded_alt many_oneshot_futures
        PASS [  12.033s] tokio::rt_threaded many_multishot_futures
------------
     Summary [  31.677s] 709/1164 tests run: 708 passed, 1 failed, 21 skipped
     SIGABRT [   6.435s] tokio::rt_threaded_alt many_multishot_futures

Darksonn · 2023-07-22T13:56:54Z

Please file a bug for the CI failure.

NobodyXu · 2023-07-22T13:58:56Z

Please file a bug for the CI failure.

I've opened issue #5888 for this.

tokio/src/runtime/coop.rs

Co-authored-by: Taiki Endo <te316e89@gmail.com> Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

tokio/README.md

README.md

tokio/build.rs

tokio/src/runtime/coop.rs

Co-authored-by: Taiki Endo <te316e89@gmail.com>

tokio/Cargo.toml

By replacing `any(target_arch = "wasm32", target_arch = "wasm64")` with `target_family = "wasm"`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

taiki-e

LGTM, thanks!

vilgotf · 2023-07-27T05:24:16Z

tokio/Cargo.toml

@@ -107,8 +104,8 @@ mio = { version = "0.8.6", optional = true, default-features = false }
 num_cpus = { version = "1.8.0", optional = true }


Could this not be replaced by std::thread::available_parallelism?

Well, this is outside the scope of this PR.

This PR is for bumping MSRV for tokio only, you can open another PR/issue/discussion for this.

available_parallelism was stabilized with an incomplete implementation, and it is expected to cause regressions (e.g., OOM) in Rust 1.63 and smaller that doesn't have cgroupv1 support (rust-lang/rust#97925).

So I think we need to stick to num_cpus until MSRV becomes 1.64+.

NobodyXu · 2023-07-27T07:36:29Z

Is there anything need to do for this PR to merge?

Or are we just waiting for others' review?

NobodyXu · 2023-07-27T09:01:32Z

Thank you very much for the review!

bcardarella · 2023-08-06T10:45:13Z

Does Tokio have a regular release cadence where we can plan on this being in a release soon? This feature is critical to a project I'm working on.

Darksonn · 2023-08-06T11:32:05Z

No, we do not have a regular cadence for releases, but we were planning on making one soon. If you wish to speed up the process, then you can help us by submitting a PR that prepares the release. See #5650 for an example.

bcardarella · 2023-08-06T11:40:43Z

@Darksonn what is the criteria for what goes into the changelog and what should the next version bump be?

Darksonn · 2023-08-06T13:01:46Z

The next version number should be 1.30.0. As for what is included, well:

All changes to the public API, including behavior changes, must be listed.
For documentation changes, we skip small changes, but otherwise we include them.
Changes to unstable parts of Tokio are mentioned in a separate section for unstable changes.
Changes to CI and similar are not included.

I will review your PR, so if anything is missing or should be omitted, I will let you know.

bcardarella · 2023-08-06T13:07:21Z

@Darksonn is there a particular commit the next version should be PR'd against or just master/HEAD?

Darksonn · 2023-08-06T15:10:28Z

The master branch is fine.

bcardarella · 2023-08-06T15:14:30Z

Looking over your list of changelog requirements it seems I would need a very intimate familiarity with the code base and the API to determine what is and isn't a changed behavior. If you're using SEMVER and bumping the minor I assume there are only additive API changes and nothing breaking.

Darksonn · 2023-08-06T15:28:06Z

Just categorize them according to how they look to you at a first glance. There's no need to be worried about getting it wrong—I will review the PR and tell you what things to change, if any. I know that you're not familiar with the codebase.

Darksonn · 2023-08-06T15:28:21Z

You may assume that there are no breaking changes.

Bump tokio MSRV to 1.63

d4fa34c

Also cleanup `build.rs` and remove dependency `autocfg`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

github-actions bot added R-loom-current-thread Run loom current-thread tests on this PR R-loom-multi-thread Run loom multi-thread tests on this PR R-loom-multi-thread-alt Run loom multi-thread alt tests on this PR R-loom-sync Run loom sync tests on this PR labels Jul 22, 2023

NobodyXu mentioned this pull request Jul 22, 2023

Make {Mutex, Notify, OnceCell, RwLock, Semaphore}::const_new always available #5885

Merged

Darksonn reviewed Jul 22, 2023

View reviewed changes

README.md Outdated Show resolved Hide resolved

tokio/Cargo.toml Show resolved Hide resolved

Darksonn added the A-tokio Area: The main tokio crate label Jul 22, 2023

Update README.md

ee335b7

Co-authored-by: Alice Ryhl <aliceryhl@google.com>

NobodyXu commented Jul 22, 2023

View reviewed changes

tokio/build.rs Outdated Show resolved Hide resolved

README.md Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

NobodyXu added 4 commits July 22, 2023 21:38

Fix /tokio/README.md: It should be identical to /README.md

08b046c

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Bump dep socket2 to v0.5.3

8ee51c1

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Update url link to socket2 in comment

84feca0

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Fix /tokio/README.md: Make it identical to /README.md

13563a4

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

NobodyXu requested a review from Darksonn July 22, 2023 11:51

Replace use of tokio_wasm in tests with target_family = "wasm"

1d1e5e2

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

github-actions bot added the R-loom-time-driver Run loom time driver tests on this PR label Jul 22, 2023

NobodyXu force-pushed the bump-msrv branch from 5b43eae to 5e67c3c Compare July 22, 2023 13:11

Rm build.rs and replace tokio_wasi & tokio_wasm_not_wasi

c2c13d4

Replace `tokio_wasi` with `target_os = "wasi"` and replace latter with `cfg_is_wasm_not_wasi!` or `all(target_family = "wasm", not(target_os = "wasi"))`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

NobodyXu force-pushed the bump-msrv branch from 5e67c3c to c2c13d4 Compare July 22, 2023 13:17

Fix CI test for wasm32-unknown-unknown

4be9109

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

Darksonn approved these changes Jul 22, 2023

View reviewed changes

NobodyXu mentioned this pull request Jul 22, 2023

CI spuriously failed due to panic in tokio::rt_threaded_alt many_multishot_futures #5888

Closed

taiki-e requested changes Jul 24, 2023

View reviewed changes

tokio/src/runtime/coop.rs Outdated Show resolved Hide resolved

NobodyXu force-pushed the bump-msrv branch from d121d5f to 9d35ca2 Compare July 25, 2023 02:00

Simplify cfg for import of wasm_bindgen_test::wasm_bindgen_test

128f411

Co-authored-by: Taiki Endo <te316e89@gmail.com> Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

NobodyXu force-pushed the bump-msrv branch from 9d35ca2 to 128f411 Compare July 25, 2023 02:06

NobodyXu requested a review from taiki-e July 25, 2023 02:10

Darksonn mentioned this pull request Jul 25, 2023

deps!: bump socket2 (to 0.5.3) and MSRV (to 1.63) #5877

Closed

taiki-e reviewed Jul 25, 2023

View reviewed changes

tokio/README.md Outdated Show resolved Hide resolved

README.md Outdated Show resolved Hide resolved

tokio/build.rs Show resolved Hide resolved

tokio/src/runtime/coop.rs Outdated Show resolved Hide resolved

Apply suggestions from code review

6315094

Co-authored-by: Taiki Endo <te316e89@gmail.com>

taiki-e reviewed Jul 25, 2023

View reviewed changes

tokio/Cargo.toml Outdated Show resolved Hide resolved

Simplify Cargo.toml dependencies declaration

09fb572

By replacing `any(target_arch = "wasm32", target_arch = "wasm64")` with `target_family = "wasm"`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

NobodyXu requested a review from taiki-e July 25, 2023 13:00

taiki-e approved these changes Jul 25, 2023

View reviewed changes

Darksonn approved these changes Jul 25, 2023

View reviewed changes

vilgotf reviewed Jul 27, 2023

View reviewed changes

Darksonn merged commit c445e46 into tokio-rs:master Jul 27, 2023
81 checks passed

NobodyXu deleted the bump-msrv branch July 27, 2023 09:01

NobodyXu mentioned this pull request Jul 28, 2023

Removed unused tokio_* cfgs #5890

Merged

bcardarella mentioned this pull request Aug 7, 2023

chore: prepare Tokio v1.30.0 release #5917

Merged

jtescher mentioned this pull request Aug 11, 2023

bump MSRV to 1.64 and indexmap to 2.0 open-telemetry/opentelemetry-rust#1203

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump tokio MSRV to 1.63 #5887

Bump tokio MSRV to 1.63 #5887

NobodyXu commented Jul 22, 2023 •

edited

NobodyXu commented Jul 22, 2023

Darksonn commented Jul 22, 2023

NobodyXu commented Jul 22, 2023

taiki-e left a comment

vilgotf Jul 27, 2023

NobodyXu Jul 27, 2023

taiki-e Jul 27, 2023 •

edited

NobodyXu commented Jul 27, 2023

NobodyXu commented Jul 27, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023 •

edited

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

Darksonn commented Aug 6, 2023

		@@ -107,8 +104,8 @@ mio = { version = "0.8.6", optional = true, default-features = false }
		num_cpus = { version = "1.8.0", optional = true }

Bump tokio MSRV to 1.63 #5887

Bump tokio MSRV to 1.63 #5887

Conversation

NobodyXu commented Jul 22, 2023 • edited

Motivation

Solution

NobodyXu commented Jul 22, 2023

Darksonn commented Jul 22, 2023

NobodyXu commented Jul 22, 2023

taiki-e left a comment

Choose a reason for hiding this comment

vilgotf Jul 27, 2023

Choose a reason for hiding this comment

NobodyXu Jul 27, 2023

Choose a reason for hiding this comment

taiki-e Jul 27, 2023 • edited

Choose a reason for hiding this comment

NobodyXu commented Jul 27, 2023

NobodyXu commented Jul 27, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023 • edited

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

bcardarella commented Aug 6, 2023

Darksonn commented Aug 6, 2023

Darksonn commented Aug 6, 2023

NobodyXu commented Jul 22, 2023 •

edited

taiki-e Jul 27, 2023 •

edited

bcardarella commented Aug 6, 2023 •

edited