[PR #581] [MERGED] Tokio migration #979

Closed
opened 2026-02-27 20:00:41 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/librespot-org/librespot/pull/581
Author: @ashthespy
Created: 1/25/2021
Status: Merged
Merged: 1/26/2021
Merged by: @ashthespy

Base: tokio_migrationHead: tokio_migration


📝 Commits (10+)

  • 6f5607d [Core] Bump hyper to ~0.12
  • 931c820 [Connect] Migrate to hyper ~v12
  • 962d7af Clean up hyper from binary
  • 9bbf8c3 WIP tokio-core -> tokio migration
  • 53b4ab0 Migrate to tokio 0.1
  • c69ccf7 [Connect] Migrate to tokio 0.1
  • 47a1575 WIP Futures
  • 94fc0a1 [Core/connection] Refactor to async/await
  • c273d51 [AudioKeyManager] Convert to async
  • 20dd94f Fix tokio dependency in main

📊 Changes

36 files changed (+2509 additions, -3740 deletions)

View changed files

📝 Cargo.lock (+1366 -1788)
📝 Cargo.toml (+13 -27)
📝 audio/Cargo.toml (+6 -5)
📝 audio/src/decrypt.rs (+2 -2)
📝 audio/src/fetch.rs (+407 -366)
📝 audio/src/lib.rs (+6 -3)
📝 audio/src/range_set.rs (+8 -12)
📝 connect/Cargo.toml (+3 -2)
📝 connect/src/discovery.rs (+39 -31)
📝 connect/src/lib.rs (+1 -1)
📝 core/Cargo.toml (+15 -14)
📝 core/src/apresolve.rs (+47 -79)
📝 core/src/audio_key.rs (+3 -19)
📝 core/src/authentication.rs (+4 -6)
📝 core/src/channel.rs (+53 -38)
📝 core/src/component.rs (+0 -26)
📝 core/src/connection/codec.rs (+3 -4)
📝 core/src/connection/handshake.rs (+50 -123)
📝 core/src/connection/mod.rs (+50 -72)
📝 core/src/diffie_hellman.rs (+6 -6)

...and 16 more files

📄 Description

I rebased the old PR (https://github.com/librespot-org/librespot/pull/487) and merged work from https://github.com/librespot-org/librespot/pull/574 into the current tree..
This should fix all the conflicts in both the above PRs, so that progress can be made..

Big thanks to @Johannesd3 for the significant progress and the porting over to tokio 1.0! :-)


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/librespot-org/librespot/pull/581 **Author:** [@ashthespy](https://github.com/ashthespy) **Created:** 1/25/2021 **Status:** ✅ Merged **Merged:** 1/26/2021 **Merged by:** [@ashthespy](https://github.com/ashthespy) **Base:** `tokio_migration` ← **Head:** `tokio_migration` --- ### 📝 Commits (10+) - [`6f5607d`](https://github.com/librespot-org/librespot/commit/6f5607d9abd3880842f5abc935239c0e357e7d67) [Core] Bump hyper to ~0.12 - [`931c820`](https://github.com/librespot-org/librespot/commit/931c8207fc29e28728a8f034a7b540724a12733a) [Connect] Migrate to hyper ~v12 - [`962d7af`](https://github.com/librespot-org/librespot/commit/962d7af24df7bc2df24bacc7bd1068e402d9e0d2) Clean up hyper from binary - [`9bbf8c3`](https://github.com/librespot-org/librespot/commit/9bbf8c3b26cef284eea5e193ce5755c4897b9d73) WIP tokio-core -> tokio migration - [`53b4ab0`](https://github.com/librespot-org/librespot/commit/53b4ab05ba9f1627d568c0193cc246fb9cae3fca) Migrate to `tokio` 0.1 - [`c69ccf7`](https://github.com/librespot-org/librespot/commit/c69ccf77e99c6d19ca10818d4841de12e6329c33) [Connect] Migrate to `tokio` 0.1 - [`47a1575`](https://github.com/librespot-org/librespot/commit/47a1575c00ee1b0abee98599e3e2d478638e18ca) WIP Futures - [`94fc0a1`](https://github.com/librespot-org/librespot/commit/94fc0a12da8c9bdc9358a7c255e138a7aebb734b) [Core/connection] Refactor to async/await - [`c273d51`](https://github.com/librespot-org/librespot/commit/c273d51a1df00d73935538c3952ef016216fc131) [AudioKeyManager] Convert to async - [`20dd94f`](https://github.com/librespot-org/librespot/commit/20dd94fe2079e998480a72e04acd50ab46a2393b) Fix tokio dependency in main ### 📊 Changes **36 files changed** (+2509 additions, -3740 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+1366 -1788) 📝 `Cargo.toml` (+13 -27) 📝 `audio/Cargo.toml` (+6 -5) 📝 `audio/src/decrypt.rs` (+2 -2) 📝 `audio/src/fetch.rs` (+407 -366) 📝 `audio/src/lib.rs` (+6 -3) 📝 `audio/src/range_set.rs` (+8 -12) 📝 `connect/Cargo.toml` (+3 -2) 📝 `connect/src/discovery.rs` (+39 -31) 📝 `connect/src/lib.rs` (+1 -1) 📝 `core/Cargo.toml` (+15 -14) 📝 `core/src/apresolve.rs` (+47 -79) 📝 `core/src/audio_key.rs` (+3 -19) 📝 `core/src/authentication.rs` (+4 -6) 📝 `core/src/channel.rs` (+53 -38) 📝 `core/src/component.rs` (+0 -26) 📝 `core/src/connection/codec.rs` (+3 -4) 📝 `core/src/connection/handshake.rs` (+50 -123) 📝 `core/src/connection/mod.rs` (+50 -72) 📝 `core/src/diffie_hellman.rs` (+6 -6) _...and 16 more files_ </details> ### 📄 Description I rebased the old PR (https://github.com/librespot-org/librespot/pull/487) and merged work from https://github.com/librespot-org/librespot/pull/574 into the current tree.. This should fix all the conflicts in both the above PRs, so that progress can be made.. Big thanks to @Johannesd3 for the significant progress and the porting over to tokio 1.0! :-) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-27 20:00:41 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/librespot#979
No description provided.