Skip to content

Bump tokio version to 1.30 to avoid duplicate socket2 dependency#9043

Merged
alexcrichton merged 2 commits into
bytecodealliance:mainfrom
iawia002:deps
Jul 30, 2024
Merged

Bump tokio version to 1.30 to avoid duplicate socket2 dependency#9043
alexcrichton merged 2 commits into
bytecodealliance:mainfrom
iawia002:deps

Conversation

@iawia002
Copy link
Copy Markdown
Contributor

In #8983, we introduced the redis dependency, which relies on socket2 0.5. This conflicts with our existing version 0.4, leading to cargo deny throwing the following error when trying to merge #9032 (https://github.com/bytecodealliance/wasmtime/actions/runs/10147488558/job/28058006599).

error[duplicate]: found 2 duplicate entries for crate 'socket2'
    ┌─ /home/runner/work/wasmtime/wasmtime/Cargo.lock:224:1
    │  
224 │ ╭ socket2 0.4.9 registry+https://github.com/rust-lang/crates.io-index
225 │ │ socket2 0.5.7 registry+https://github.com/rust-lang/crates.io-index
    │ ╰───────────────────────────────────────────────────────────────────^ lock entries

Therefore, this patch updates the version of tokio from 1.29.1 to 1.30. With this update, we will no longer have duplicate socket2 dependencies, as both will depend on version 0.5.

NOTE: I could also downgrade the redis version to 0.25.0, which relies on socket2 0.4, but this version has significant bugs and has been yanked.

Screenshot 2024-07-30 at 10 24 34

@iawia002 iawia002 requested a review from a team as a code owner July 30, 2024 02:28
@iawia002 iawia002 requested review from alexcrichton and removed request for a team July 30, 2024 02:28
@alexcrichton alexcrichton enabled auto-merge July 30, 2024 14:20
@alexcrichton alexcrichton added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@alexcrichton alexcrichton added this pull request to the merge queue Jul 30, 2024
Merged via the queue into bytecodealliance:main with commit f5e5b29 Jul 30, 2024
@iawia002 iawia002 deleted the deps branch July 30, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants