[RFC] clippy new warnings in rustc 1.86.0 (05f9846f8 2025-03-31) #3710

vincenzopalazzo · 2025-04-05T11:23:32Z

I was using an older version of the compiler, and Clippy did not report any issues. However, after updating to Rust 1.86.0, I was able to reproduce the warnings that we are having inside the CI. This patch proposes an opinionated solution that aligns with Clippy’s suggestions, but I am open to disabling some of the warnings if needed.

The commits include specific changes to highlight the errors, making the review process easier.

Probably @TheBlueMatt will have some opinion on this!

ldk-reviews-bot · 2025-04-05T11:23:35Z

I've assigned @valentinewallace as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

``` error: manual implementation of `ok` --> lightning/src/ln/channel.rs:8551:3 | 8551 | / match self.sign_channel_announcement(node_signer, announcement) { 8552 | | Ok(res) => Some(res), 8553 | | Err(_) => None, 8554 | | } | |_________^ help: replace with: `self.sign_channel_announcement(node_signer, announcement).ok()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_ok_err = note: `-D clippy::manual-ok-err` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::manual_ok_err)]` ``` Signed-off-by: Vincenzo Palazzo <[email protected]>

This is the most opinonated suggestion in this sequence of patches. Probably IDK if would be an option disable this check, but for now this commit propose a formatting fix to make clippy happy. ``` error: doc list item overindented --> lightning-types/src/features.rs:62:5 | 62 | //! onion. | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items = note: `-D clippy::doc-overindented-list-items` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::doc_overindented_list_items)]` error: doc list item overindented --> lightning-types/src/features.rs:63:5 | 63 | //! (see [BOLT-11](https://github.com/lightning/bolts/blob/master/11-payment-encoding.md) for | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items error: doc list item overindented --> lightning-types/src/features.rs:64:5 | 64 | //! more). | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items error: doc list item overindented --> lightning-types/src/features.rs:66:5 | 66 | //! (see | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items error: doc list item overindented --> lightning-types/src/features.rs:67:5 | 67 | //! [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message) | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items error: doc list item overindented --> lightning-types/src/features.rs:68:5 | 68 | //! for more info). | ^^^ help: try using ` ` (2 spaces) | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#doc_overindented_list_items error: could not compile `lightning-types` (lib) due to 6 previous errors ``` Signed-off-by: Vincenzo Palazzo <[email protected]>

with recent rustc version we can use `repeat_n` instead of `repeat().take()` ``` error: this `repeat().take()` can be written more concisely --> lightning-invoice/src/ser.rs:256:12 | 256 | Box::new(core::iter::repeat(Fe32::Q).take(to_pad).chain(fes)) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `repeat_n()` instead: `core::iter::repeat_n(Fe32::Q, to_pad)` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_repeat_n = note: `-D clippy::manual-repeat-n` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(clippy::manual_repeat_n)]` ``` but to keep compatibility with older rustc versions we need to disable the warning for the `repeat_n` lint. Signed-off-by: Vincenzo Palazzo <[email protected]>

codecov · 2025-04-05T11:46:34Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.04%. Comparing base (c4d23bc) to head (abadb79).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3710      +/-   ##
==========================================
- Coverage   89.04%   89.04%   -0.01%     
==========================================
  Files         155      155              
  Lines      122019   122017       -2     
  Branches   122019   122017       -2     
==========================================
- Hits       108652   108647       -5     
- Misses      10701    10710       +9     
+ Partials     2666     2660       -6

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

dunxen · 2025-04-06T07:36:07Z

The changes seem minimal and the formatting is being properly corrected, because it's aligning further lines with the leading backtick, unlike before where those instance were aligned with the first letter.

So this LGTM

dunxen · 2025-04-06T07:41:18Z

lightning-types/src/features.rs

+//!  (see [BOLT-11](https://github.com/lightning/bolts/blob/master/11-payment-encoding.md) for
+//!  more).


hmm these don't look right, though. does clippy complain if they have just one for leading space?

dunxen · 2025-04-06T07:42:11Z

lightning-types/src/features.rs

+//!  (see
+//!  [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message)
+//!  for more info).


this as well. does it complain if you had only removed one leading space from each? it really should be 3 leading spaces, not 2.

Let me double-check this, I just applied what the error was saying without double checking for different spaces quantity! space suggestions are always weird IMHO :)

So you are suggesting another space?

Yeah, since this looks odd:

//! - `ZeroConf` - supports accepting HTLCs and using channels prior to funding confirmation //! (see //! [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message) //! for more info).

And this looks right:

//! - `ZeroConf` - supports accepting HTLCs and using channels prior to funding confirmation //! (see //! [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message) //! for more info).

It's weird, but maybe you applied changes for this on main after looking at an old CI run before #3704?

tnull

Hmm, I'm a bit confused why we need to touch features.rs once more, wasn't this solved in #3704 ?

dunxen · 2025-04-07T09:37:18Z

Hmm, I'm a bit confused why we need to touch features.rs once more, wasn't this solved in #3704 ?

Yeah, those changes are correct. I think this might have been applied to main (after 3704) here according to suggestions on a CI run (before 3704).

dunxen · 2025-04-07T11:20:47Z

ci/check-lint.sh

@@ -94,4 +94,5 @@ RUSTFLAGS='-D warnings' cargo clippy -- \
 	-A clippy::unnecessary_unwrap \
 	-A clippy::unused_unit \
 	-A clippy::useless_conversion \
-	-A clippy::unnecessary_map_or `# to be removed once we hit MSRV 1.70`
+	-A clippy::unnecessary_map_or `# to be removed once we hit MSRV 1.70` \
+	-A clippy::manual-repeat-n `# to be removed once we hit MSRV 1.86`


nit:

Suggested change

-A clippy::manual-repeat-n `# to be removed once we hit MSRV 1.86`

-A clippy::manual_repeat_n `# to be removed once we hit MSRV 1.86`

dunxen · 2025-04-07T11:24:42Z

lightning-types/src/features.rs

Ok, I believe we only need these changes:

diff --git a/lightning-types/src/features.rs b/lightning-types/src/features.rs index 2aecdbc14..1b7f88031 100644 --- a/lightning-types/src/features.rs +++ b/lightning-types/src/features.rs @@ -59,13 +59,13 @@ //! - `SCIDPrivacy` - supply channel aliases for routing //! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information). //! - `PaymentMetadata` - include additional data in invoices which is passed to recipients in the -//! onion. -//! (see [BOLT-11](https://github.com/lightning/bolts/blob/master/11-payment-encoding.md) for -//! more). +//! onion. +//! (see [BOLT-11](https://github.com/lightning/bolts/blob/master/11-payment-encoding.md) for +//! more). //! - `ZeroConf` - supports accepting HTLCs and using channels prior to funding confirmation -//! (see -//! [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message) -//! for more info). +//! (see +//! [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-channel_ready-message) +//! for more info). //! - `Keysend` - send funds to a node without an invoice //! (see the [`Keysend` feature assignment proposal](https://github.com/lightning/bolts/issues/605#issuecomment-606679798) for more information). //! - `Trampoline` - supports receiving and forwarding Trampoline payments

ldk-reviews-bot · 2025-04-07T11:34:24Z

🔔 1st Reminder

Hey @valentinewallace! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

vincenzopalazzo force-pushed the macros/docs-fix branch from da14d57 to 3bbf7f0 Compare April 5, 2025 11:31

ldk-reviews-bot requested a review from valentinewallace April 5, 2025 11:33

vincenzopalazzo added 2 commits April 5, 2025 13:34

vincenzopalazzo force-pushed the macros/docs-fix branch from 3bbf7f0 to 19f149e Compare April 5, 2025 11:34

dunxen reviewed Apr 6, 2025

View reviewed changes

tnull reviewed Apr 7, 2025

View reviewed changes

dunxen reviewed Apr 7, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RFC] clippy new warnings in rustc 1.86.0 (05f9846f8 2025-03-31) #3710

[RFC] clippy new warnings in rustc 1.86.0 (05f9846f8 2025-03-31) #3710

vincenzopalazzo commented Apr 5, 2025 •

edited

Loading

ldk-reviews-bot commented Apr 5, 2025 •

edited

Loading

codecov bot commented Apr 5, 2025 •

edited

Loading

dunxen commented Apr 6, 2025

dunxen Apr 6, 2025

dunxen Apr 6, 2025

vincenzopalazzo Apr 6, 2025

dunxen Apr 6, 2025 •

edited

Loading

dunxen Apr 7, 2025 •

edited

Loading

tnull left a comment

dunxen commented Apr 7, 2025

dunxen Apr 7, 2025

dunxen Apr 7, 2025

ldk-reviews-bot commented Apr 7, 2025

		//! (see [BOLT-11](https://github.com/lightning/bolts/blob/master/11-payment-encoding.md) for
		//! more).

	-A clippy::manual-repeat-n `# to be removed once we hit MSRV 1.86`
	-A clippy::manual_repeat_n `# to be removed once we hit MSRV 1.86`

[RFC] clippy new warnings in rustc 1.86.0 (05f9846f8 2025-03-31) #3710

Are you sure you want to change the base?

[RFC] clippy new warnings in rustc 1.86.0 (05f9846f8 2025-03-31) #3710

Conversation

vincenzopalazzo commented Apr 5, 2025 • edited Loading

ldk-reviews-bot commented Apr 5, 2025 • edited Loading

codecov bot commented Apr 5, 2025 • edited Loading

Codecov Report

dunxen commented Apr 6, 2025

dunxen Apr 6, 2025

Choose a reason for hiding this comment

dunxen Apr 6, 2025

Choose a reason for hiding this comment

vincenzopalazzo Apr 6, 2025

Choose a reason for hiding this comment

dunxen Apr 6, 2025 • edited Loading

Choose a reason for hiding this comment

dunxen Apr 7, 2025 • edited Loading

Choose a reason for hiding this comment

tnull left a comment

Choose a reason for hiding this comment

dunxen commented Apr 7, 2025

dunxen Apr 7, 2025

Choose a reason for hiding this comment

dunxen Apr 7, 2025

Choose a reason for hiding this comment

ldk-reviews-bot commented Apr 7, 2025

vincenzopalazzo commented Apr 5, 2025 •

edited

Loading

ldk-reviews-bot commented Apr 5, 2025 •

edited

Loading

codecov bot commented Apr 5, 2025 •

edited

Loading

dunxen Apr 6, 2025 •

edited

Loading

dunxen Apr 7, 2025 •

edited

Loading