Skip to content

Prepare Tokio v1.43.3#7679

Closed
ADD-SP wants to merge 8 commits intotokio-rs:tokio-1.43.xfrom
ADD-SP:add_sp/prepare-tokio-1.43.4
Closed

Prepare Tokio v1.43.3#7679
ADD-SP wants to merge 8 commits intotokio-rs:tokio-1.43.xfrom
ADD-SP:add_sp/prepare-tokio-1.43.4

Conversation

@ADD-SP
Copy link
Copy Markdown
Member

@ADD-SP ADD-SP commented Oct 14, 2025 •
edited
Loading

1.43.3 (October 14th, 2025)

Fixed

  • runtime: use release ordering in wake_by_ref() even if already woken (#7622)
  • sync: close the broadcast::Sender in broadcast::Sender::new() (#7629)
  • process: fix error when runtime is shut down on nightly-2025-10-12 #7672)

Additional backports to make the CI happy

  • ci: pin the rust version for wasm tests (#7518)
  • ci: update macros_type_mismatch for Rust 1.90.0 (#7630)

Dependencies (locked) bumped due to the reports of cargo-deny

  • Bump the tracing-subscriber to 0.3.20
  • Bump the slab to 0.4.11

@ADD-SP ADD-SP added the A-tokio Area: The main tokio crate label Oct 14, 2025
@github-actions 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-sync Run loom sync tests on this PR R-loom-multi-thread-alt labels Oct 14, 2025
ADD-SP
ADD-SP commented Oct 14, 2025
View reviewed changes
Comment thread tokio/tests/sync_broadcast.rs
Comment on lines +660 to +670
#[tokio::test]
async fn broadcast_sender_new_must_be_closed() {
let capacity = 1;
let tx: broadcast::Sender<()> = broadcast::Sender::new(capacity);

tx.send(()).unwrap_err();

let _rx = tx.subscribe();

tx.send(()).unwrap();
}
Copy link
Copy Markdown
Member Author

@ADD-SP ADD-SP Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This diverges the #7629 due to the Sender::closed() is not available in tokio 1.43.x.

ADD-SP
ADD-SP commented Oct 14, 2025
View reviewed changes
Comment thread .github/workflows/ci.yml
steps:
- uses: actions/checkout@v4
- name: Install Rust ${{ env.rust_stable }}
- name: Install Rust 1.88.0
Copy link
Copy Markdown
Member Author

@ADD-SP ADD-SP Oct 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose to not backport the #7537 because it is a quite large change, changes on LTS should be minimal unless absolutely necessary.

@Darksonn
Copy link
Copy Markdown
Member

Darksonn commented Oct 14, 2025

We're going to merge this with fast-forward instead of squash, so please include the (#nnnn) in the commit titles. Also, if you use git cherry-pick -x then the commit message will include a reference for the original commit.

@ADD-SP ADD-SP force-pushed the add_sp/prepare-tokio-1.43.4 branch from d4c587e to 94f9a3c Compare October 14, 2025 13:57
@github-actions github-actions Bot removed 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 labels Oct 14, 2025
@ADD-SP ADD-SP force-pushed the add_sp/prepare-tokio-1.43.4 branch from 94f9a3c to ea0613a Compare October 14, 2025 13:59
@github-actions 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 labels Oct 14, 2025
@Darksonn
Copy link
Copy Markdown
Member

Darksonn commented Oct 14, 2025

What about #7672?

@Darksonn
Copy link
Copy Markdown
Member

Darksonn commented Oct 14, 2025

Nice. Once you get CI to pass, you can add a commit that actually prepares the release. I would also consider reordering the commits so that the ci changes comes first.

@ADD-SP
Copy link
Copy Markdown
Member Author

ADD-SP commented Oct 14, 2025 •
edited
Loading

bf70d06 is not a real cherry-pick because its original commit is an empty commit in the default branch.

@Darksonn
Copy link
Copy Markdown
Member

Darksonn commented Oct 14, 2025 •
edited
Loading

Please cherry-pick 9e5527d instead.

@ADD-SP ADD-SP force-pushed the add_sp/prepare-tokio-1.43.4 branch from bf70d06 to 49b3318 Compare October 14, 2025 14:14
@ADD-SP ADD-SP changed the title Prepare Tokio v1.43.4 Prepare Tokio v1.43.3 Oct 14, 2025
@ADD-SP ADD-SP marked this pull request as ready for review October 14, 2025 14:43
Darksonn
Darksonn reviewed Oct 14, 2025
View reviewed changes
Comment thread tokio/CHANGELOG.md Outdated
@ADD-SP ADD-SP force-pushed the add_sp/prepare-tokio-1.43.4 branch from 084b35e to cb4fa60 Compare October 14, 2025 14:46
ADD-SP added 3 commits October 14, 2025 22:54
@ADD-SP
deps: bump the locked tracing-subscriber to 0.3.20
bd4c3dd 
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
@ADD-SP
deps: bump the locked slap to 0.4.11
90551d2 
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
@ADD-SP
chore: prepare Tokio v1.43.3
de6ef21 
Signed-off-by: ADD-SP <qiqi.zhang@konghq.com>
@ADD-SP ADD-SP force-pushed the add_sp/prepare-tokio-1.43.4 branch from cb4fa60 to de6ef21 Compare October 14, 2025 14:54
@ADD-SP
Copy link
Copy Markdown
Member Author

ADD-SP commented Oct 14, 2025

This CircleCI workflow doesn't work for forked repo, because it tries to fetch the HEAD commit from tokio-rs/tokio instead of the forked repo.

I made it green in this PR by pushing the same branch in this repo instead of my fork.

@ADD-SP
Copy link
Copy Markdown
Member Author

ADD-SP commented Oct 14, 2025

Superseded by #7680, which doesn't involve the forked repo.

@ADD-SP ADD-SP closed this Oct 14, 2025
@ADD-SP ADD-SP deleted the add_sp/prepare-tokio-1.43.4 branch October 14, 2025 15:22
@ADD-SP ADD-SP mentioned this pull request Oct 14, 2025
Merged
@Darksonn
Copy link
Copy Markdown
Member

Darksonn commented Oct 14, 2025

I guess we could backport #7123 and get rid of circleci. Oh well, doesn't matter that much.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Darksonn Darksonn Darksonn left review comments

Assignees

No one assigned

Labels

A-tokio Area: The main tokio crate 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-sync Run loom sync tests on this PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ADD-SP @Darksonn @mox692 @frostyplanet @martin-g