Rustfmt Maximalism by joostjager · Pull Request #3749 · lightningdevkit/rust-lightning

joostjager · 2025-04-25T05:49:35Z

Just enable it globally. We can take care of format refactors later or as we update the code, and this way we immediately eliminate the ongoing formatting micro-penalties.

To auto-format in-flight PRs without manual conflict resolution:

Let's say commit X is the commit where all of main is rustfmt'ed. Nothing other dan cargo fmt should have been done in this commit.

First rebase the branch normally onto the predecessor of X (still without formatting) to resolve any outstanding conflicts.
Create and checkout a new branch for the rewrite off of X.
Run the following script, replace BRANCH with the branch to replay:

#!/bin/bashecho Start
BRANCH="2025-04-rustfmt-tests-1"forcommitin$(git rev-list --reverse HEAD..$BRANCH);doecho"Commit: $commit"
git restore --source=$commit.
cargo fmt
git add .
git commit -c $commit --no-edit --allow-empty
done

Now every commit in the new branch is rustfmted and exists on top of formatted main.

ldk-reviews-bot · 2025-04-25T05:49:37Z

👋 I see @wpaulino was un-assigned.
If you'd like another reviewer assignemnt, please click here.

tnull

Confirmed I get the same output by running cargo fmt

valentinewallace

ACK if you review any follow-ups to fix things up after this :)

valentinewallace · 2025-04-25T16:48:12Z

+	'a,
+	'b,
+	'c,
+	'd,
+	'e,
+	'f,
+	'logger,
+	'h,
+	'i,
+	'j,
+	'graph,
+	'k,
+	'mr,
+	SD,
+	M,
+	T,
+	F,
+	C,
+	L,


benthecarman

we're so back

jkczyz · 2025-04-25T22:38:57Z

+ flags & FundedStateFlags::ALL
+ == FundedStateFlags::LOCAL_SHUTDOWN_SENT


This fits on one line. Is there something about our config that would cause it to split it over two lines?

The reason is that rustfmt wants to put the == on the same line, pushing the total == FundedStateFlags::LOCAL_SHUTDOWN_SENT | FundedStateFlags::REMOTE_SHUTDOWN_SENT to column 101. So expected behavior afaik.

Ah, it's bitwise not logical OR.

ldk-reviews-bot · 2025-04-28T00:00:14Z

🔔 1st Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-04-28T00:00:15Z

🔔 1st Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-04-28T00:09:24Z

🔔 1st Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

carlaKC

ACK, matches local cargo fmt

carlaKC · 2025-04-28T12:19:30Z

-for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
-	echo "Checking formatting of $file"
-	rustfmt $VERS --edition 2021 --check "$file"
-done


CONTRIBUTING.md needs update to remove reference to contrib/run-rustfmt.sh

Good one, will fix after rebase

ldk-reviews-bot · 2025-04-30T00:00:52Z

🔔 2nd Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-04-30T00:00:54Z

🔔 2nd Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

dunxen

I'm actually leaning toward this PR's approach and biting the bullet. I don't believe it's that cumbersome to existing PRs with your suggested solution.

Running cargo +1.63 fmt (MSRV-shipped rustfmt), I get the same output.

joostjager · 2025-04-30T13:10:09Z

To be sure we wouldn't get any problems with in-flight prs, I tried the filter-branch command from the PR description on #3751: joostjager/rust-lightning@main-fmt...joostjager:rust-lightning:rustfmt-tests-rewritten

joostjager · 2025-05-01T20:09:58Z

Another option that could be used is #[rustfmt::skip] on the method level, for code that turns out unreadable beyond personal preference.

TheBlueMatt · 2025-05-01T22:17:12Z

After rebasing my own rustfmt stuff I realized that the main rebase logic won't actually work in some cases around indentation changes. Because git sometimes mis-identifies hunks as non-conflict it'll end up duplicating some lines.

joostjager · 2025-05-02T07:35:34Z

After rebasing my own rustfmt stuff I realized that the main rebase logic won't actually work in some cases around indentation changes. Because git sometimes mis-identifies hunks as non-conflict it'll end up duplicating some lines.

I didn't run into this yet, but had identified the potential problem too. Updated the PR description with a new approach that strictly avoids any type of merge logic / automatic conflict resolution.

ldk-reviews-bot · 2025-05-03T00:00:14Z

🔔 3rd Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-17T00:00:46Z

🔔 9th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-19T00:01:14Z

🔔 10th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-19T00:01:16Z

🔔 10th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-21T00:01:52Z

🔔 11th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-21T00:01:54Z

🔔 11th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-24T00:00:37Z

🔔 12th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-24T00:00:38Z

🔔 12th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-26T00:00:49Z

🔔 13th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-26T00:00:50Z

🔔 13th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-28T00:01:24Z

🔔 14th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-28T00:01:26Z

🔔 14th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-31T00:00:13Z

🔔 15th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-05-31T00:00:15Z

🔔 15th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-02T00:01:25Z

🔔 16th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-02T00:01:30Z

🔔 16th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-04T00:02:30Z

🔔 17th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-04T00:02:35Z

🔔 17th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-07T00:00:37Z

🔔 18th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-07T00:00:40Z

🔔 18th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-09T00:01:33Z

🔔 19th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-09T00:01:41Z

🔔 19th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-11T00:02:14Z

🔔 20th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-11T00:02:20Z

🔔 20th Reminder

Hey @TheBlueMatt @jkczyz @wpaulino! 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.

ldk-reviews-bot · 2025-06-14T00:00:07Z

🔔 21st Reminder

Hey @TheBlueMatt @jkczyz! 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.

ldk-reviews-bot · 2025-06-16T00:01:02Z

🔔 22nd Reminder

Hey @TheBlueMatt @jkczyz! 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.

ldk-reviews-bot · 2025-06-18T00:01:29Z

🔔 23rd Reminder

Hey @TheBlueMatt @jkczyz! 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.

joostjager · 2025-06-18T08:03:51Z

Closing this PR. We went with the incremental #[rustfmt::skip] approach (#3809)

Cargo fmt everything
7d0a9d6

joostjager force-pushed the fmt-maximalism branch from 7be120f to ad093d8Compare April 25, 2025 06:13

Fmt check all
3d52da9

joostjager force-pushed the fmt-maximalism branch from ad093d8 to 3d52da9Compare April 25, 2025 06:20

joostjager marked this pull request as ready for review April 25, 2025 13:15

ldk-reviews-bot requested a review from wpaulino April 25, 2025 13:15

joostjager removed the request for review from wpaulino April 25, 2025 13:16

tnull requested a review from TheBlueMatt April 25, 2025 16:02

tnull approved these changes Apr 25, 2025
View reviewed changes

valentinewallace approved these changes Apr 25, 2025
View reviewed changes

benthecarman approved these changes Apr 25, 2025
View reviewed changes

joostjager requested review from jkczyz and wpaulino April 25, 2025 21:47

jkczyz reviewed Apr 25, 2025
View reviewed changes

joostjager requested a review from jkczyz April 26, 2025 00:09

joostjager added the weekly goal Someone wants to land this this week label Apr 26, 2025

carlaKC approved these changes Apr 28, 2025
View reviewed changes

joostjager mentioned this pull request Apr 29, 2025
Run rustfmt on payment_tests and functional_tests and split up the latter #3751
Merged

dunxen approved these changes Apr 30, 2025
View reviewed changes

wpaulino removed their request for review June 11, 2025 00:03

joostjager mentioned this pull request Jun 12, 2025
Rustfmt chainmonitor.rs #3847
Merged

joostjager closed this Jun 18, 2025

		flags & FundedStateFlags::ALL
		== FundedStateFlags::LOCAL_SHUTDOWN_SENT

Uh oh!

Conversation

joostjager commented Apr 25, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ldk-reviews-bot commented Apr 25, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tnull left a comment

Choose a reason for hiding this comment

Uh oh!

valentinewallace left a comment

Choose a reason for hiding this comment

Uh oh!

valentinewallaceApr 25, 2025

Choose a reason for hiding this comment

Uh oh!

benthecarman left a comment

Choose a reason for hiding this comment

Uh oh!

jkczyzApr 25, 2025

Choose a reason for hiding this comment

Uh oh!

joostjagerApr 25, 2025

Choose a reason for hiding this comment

Uh oh!

jkczyzApr 28, 2025

Choose a reason for hiding this comment

Uh oh!

ldk-reviews-bot commented Apr 28, 2025

Uh oh!

ldk-reviews-bot commented Apr 28, 2025

Uh oh!

ldk-reviews-bot commented Apr 28, 2025

Uh oh!

carlaKC left a comment

Choose a reason for hiding this comment

Uh oh!

carlaKCApr 28, 2025

Choose a reason for hiding this comment

Uh oh!

joostjagerApr 30, 2025

Choose a reason for hiding this comment

Uh oh!

ldk-reviews-bot commented Apr 30, 2025

Uh oh!

ldk-reviews-bot commented Apr 30, 2025

Uh oh!

dunxen left a comment

Choose a reason for hiding this comment

Uh oh!

joostjager commented Apr 30, 2025

Uh oh!

joostjager commented May 1, 2025

Uh oh!

TheBlueMatt commented May 1, 2025

Uh oh!

joostjager commented May 2, 2025• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ldk-reviews-bot commented May 3, 2025

Uh oh!

ldk-reviews-bot commented May 17, 2025

Uh oh!

ldk-reviews-bot commented May 19, 2025

Uh oh!

ldk-reviews-bot commented May 19, 2025

Uh oh!

ldk-reviews-bot commented May 21, 2025

Uh oh!

ldk-reviews-bot commented May 21, 2025

Uh oh!

ldk-reviews-bot commented May 24, 2025

Uh oh!

ldk-reviews-bot commented May 24, 2025

Uh oh!

ldk-reviews-bot commented May 26, 2025

Uh oh!

ldk-reviews-bot commented May 26, 2025

Uh oh!

joostjager commented Apr 25, 2025•
edited
Loading

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

joostjager commented May 2, 2025•
edited
Loading