Skip to content

Drop tokio/macros dependency in lightning-net-tokio, fix MSRV #2426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 19, 2023

Conversation

TheBlueMatt
Copy link
Collaborator

@TheBlueMatt TheBlueMatt commented Jul 17, 2023

The tokio macros feature depends on proc-macro2, which recently broke its MSRV in a patch version. Such crates aren't reasonable for us to have as dependencies, so instead we replace the one trivial use we have of tokio::select!() with our own manual future.

This is an alternative to #2424.

@TheBlueMatt TheBlueMatt added this to the 0.0.116 milestone Jul 17, 2023
@tnull tnull self-requested a review July 17, 2023 21:21
wpaulino
wpaulino previously approved these changes Jul 17, 2023
@TheBlueMatt TheBlueMatt force-pushed the 2023-07-proc-macro2-msrv branch 3 times, most recently from 3727396 to 9c2d4c6 Compare July 17, 2023 22:15
@TheBlueMatt TheBlueMatt force-pushed the 2023-07-proc-macro2-msrv branch 2 times, most recently from 818144e to 7b29d2c Compare July 17, 2023 22:21
@TheBlueMatt
Copy link
Collaborator Author

TheBlueMatt commented Jul 17, 2023

Okay, sorry for the noise, this should be good to go now. Note that we now have a new CI task which checks our code with only the deps we have as release dependencies pinned - these are the ones that are painful as our users have to do it too - and separately pin the dependencies that are only dev-dependencies.

@TheBlueMatt TheBlueMatt force-pushed the 2023-07-proc-macro2-msrv branch 3 times, most recently from 2742d86 to 55071ac Compare July 17, 2023 22:29
wpaulino
wpaulino previously approved these changes Jul 17, 2023
TheBlueMatt and others added 3 commits July 17, 2023 23:20
The `tokio` `macros` feature depends on `proc-macro2`, which
recently broke its MSRV in a patch version. Such crates aren't
reasonable for us to have as dependencies, so instead we replace
the one trivial use we have of `tokio::select!()` with our own
manual future.
The proc-macro2 crate switched to Rust edition 2021 starting with
v1.0.66, i.e., has MSRV of 1.56.

Here, we pin it in CI to fix the breakage.
wpaulino
wpaulino previously approved these changes Jul 17, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 18, 2023

Codecov Report

Patch coverage: 65.78% and project coverage change: -0.01 ⚠️

Comparison is base (c5c5f3f) 90.27% compared to head (f38b80a) 90.27%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2426      +/-   ##
==========================================
- Coverage   90.27%   90.27%   -0.01%     
==========================================
  Files         106      106              
  Lines       55664    55691      +27     
  Branches    55664    55691      +27     
==========================================
+ Hits        50249    50273      +24     
- Misses       5415     5418       +3     
Impacted Files Coverage Δ
lightning-net-tokio/src/lib.rs 75.41% <65.78%> (-1.31%) ⬇️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@TheBlueMatt
Copy link
Collaborator Author

Grrr, somehow we were trying to build lightning-transaction-sync without meeting its MSRV, fixed that in a new commit.

@wpaulino wpaulino merged commit 2e86a59 into lightningdevkit:main Jul 19, 2023
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.

5 participants