`rustfmt`: Run on `util/*` (2/2) #3323

tnull · 2024-09-18T07:42:13Z

This is PR 2/2, based on #3324.

The diff is a bit larger for this one, but AFAICT the changes look mostly reasonable (besides the oddity commented below).

FWIW, I had a look at currently open inflight PRs and the conflicts should be minimal if I'm not overlooking something.

codecov · 2024-09-18T07:50:46Z

Codecov Report

Attention: Patch coverage is 82.03883% with 185 lines in your changes missing coverage. Please review.

Project coverage is 88.28%. Comparing base (42cc4e7) to head (7153e35).

Files with missing lines	Patch %	Lines
lightning/src/util/test_channel_signer.rs	50.64%	8 Missing and 69 partials ⚠️
lightning/src/util/test_utils.rs	84.47%	66 Missing and 2 partials ⚠️
lightning/src/util/ser.rs	74.24%	17 Missing ⚠️
lightning/src/util/ser_macros.rs	90.19%	9 Missing and 1 partial ⚠️
lightning/src/util/wakers.rs	93.00%	5 Missing and 2 partials ⚠️
lightning/src/util/transaction_utils.rs	94.17%	3 Missing and 3 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3323      +/-   ##
==========================================
- Coverage   88.31%   88.28%   -0.04%     
==========================================
  Files         149      149              
  Lines      112839   113376     +537     
  Branches   112839   113376     +537     
==========================================
+ Hits        99655   100089     +434     
- Misses      10700    10765      +65     
- Partials     2484     2522      +38

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

lightning/src/util/ser.rs

TheBlueMatt · 2024-09-18T13:00:29Z

Ugh, can we split this? 42 commits in one PR is just a lot...

tnull · 2024-09-18T13:10:48Z

Ugh, can we split this? 42 commits in one PR is just a lot...

Alright, happy to if you prefer (although at least half of these commits are one-line diffs). Now split out ~the first half of commits to #3324.

tnull · 2024-09-19T08:11:18Z

Rebased after #3327 landed.

tnull · 2024-10-01T16:02:30Z

Rebased after #3324 landed.

tnull · 2024-10-07T08:25:08Z

Rebased to resolve minor conflicts.

tnull · 2024-11-05T09:14:53Z

Rebased once more to resolve minor conflicts.

Any additional comments here after we landed the split-out commits in #3324, @TheBlueMatt ?

tnull · 2024-11-18T17:57:16Z

Rebased once more to resolve minor conflicts.

TheBlueMatt

Some initial comments. Maybe could have been split across PRs.

lightning/src/util/ser_macros.rs

TheBlueMatt · 2024-12-02T18:39:14Z

lightning/src/util/ser_macros.rs

-		do_test!(concat!("01", "08", "0100000000000000"), Some(72057594037927936), None, None, None);
-		do_test!(concat!("02", "08", "0000000000000226"), None, Some((0 << 30) | (0 << 5) | (550 << 0)), None, None);
+		do_test!(
+			concat!("01", "08", "0100000000000000"),


Not sure how much readable it would be pulling out stuff here into variables? Seems that might just make stuff more confusing?

lightning/src/util/test_channel_signer.rs

lightning/src/util/transaction_utils.rs

tnull · 2024-12-03T12:28:12Z

Addressed all but one comment.

.. we pull out `Mutex` field initialization into dedicated variables as they might otherwise land on the same line when formatting, which might lead to lockorder violation false-positives when compiled with the `backtrace` feature.

tnull · 2024-12-18T08:42:57Z

Rebased once more to resolve minor conflict.

@TheBlueMatt any further comments here?

tnull commented Sep 18, 2024

View reviewed changes

lightning/src/util/ser.rs Show resolved Hide resolved

tnull force-pushed the 2024-09-rustfmt-util branch 2 times, most recently from 6c4dd83 to 9b991df Compare September 18, 2024 08:42

tnull mentioned this pull request Sep 18, 2024

rustfmt: Run on util/* (1/2) #3324

Merged

tnull added the blocked on dependent pr label Sep 18, 2024

tnull changed the title ~~rustfmt: Run on util/*~~ rustfmt: Run on util/* (2/2) Sep 18, 2024

tnull force-pushed the 2024-09-rustfmt-util branch 2 times, most recently from 60ae0af to e2dcdc7 Compare September 19, 2024 08:10

tnull force-pushed the 2024-09-rustfmt-util branch from e2dcdc7 to bc122e3 Compare October 1, 2024 16:01

tnull removed the blocked on dependent pr label Oct 7, 2024

tnull force-pushed the 2024-09-rustfmt-util branch from bc122e3 to 572f48c Compare October 7, 2024 08:23

tnull force-pushed the 2024-09-rustfmt-util branch from 572f48c to 449a0d6 Compare November 5, 2024 09:13

tnull requested a review from TheBlueMatt November 5, 2024 09:14

tnull force-pushed the 2024-09-rustfmt-util branch from 449a0d6 to b909a7a Compare November 18, 2024 17:57

TheBlueMatt reviewed Dec 2, 2024

View reviewed changes

tnull force-pushed the 2024-09-rustfmt-util branch from b909a7a to 0750550 Compare December 3, 2024 12:27

tnull added 5 commits December 18, 2024 09:39

rustfmt: Run on util/scid_utils.rs

4c70b56

rustfmt: Drop util/scid_utils.rs from exclusion list

73b8d1e

rustfmt: Run on util/ser.rs

09d365b

rustfmt: Drop util/ser.rs from exclusion list

2a9eaf9

rustfmt: Prepare util/ser_macros.rs

a29868d

tnull added 10 commits December 18, 2024 09:39

rustfmt: Run on util/ser_macros.rs

60bf9ee

rustfmt: Drop util/ser_macros.rs from exclusion list

dbe3575

rustfmt: Prepare util/test_channel_signer.rs

d372bfd

rustfmt: Run on util/test_channel_signer.rs

9142bf5

rustfmt: Drop util/test_channel_signer.rs from exclusion list

db704a7

rustfmt: Prepare util/test_utils.rs

58b4557

.. we pull out `Mutex` field initialization into dedicated variables as they might otherwise land on the same line when formatting, which might lead to lockorder violation false-positives when compiled with the `backtrace` feature.

rustfmt: Run on util/test_utils.rs

cc42fd6

rustfmt: Drop util/test_utils.rs from exclusion list

c849fbc

rustfmt: Run on util/time.rs

cd379a4

rustfmt: Drop util/time.rs from exclusion list

38e73d6

tnull force-pushed the 2024-09-rustfmt-util branch from 0750550 to 03ccbe8 Compare December 18, 2024 08:42

tnull added 8 commits December 18, 2024 09:45

rustfmt: Prepare util/transaction_utils.rs

0a752b9

rustfmt: Run on util/transaction_utils.rs

664ec5f

rustfmt: Drop util/transaction_utils.rs from exclusion list

f2cf897

rustfmt: Run on util/wakers.rs

e14fafd

rustfmt: Drop util/wakers.rs from exclusion list

c929518

rustfmt: Run on util/mod.rs

86a84ad

rustfmt: Drop util/mod.rs from exclusion list

3bf8aec

rustfmt: Drop remaining util files from exclusion list

7153e35

tnull force-pushed the 2024-09-rustfmt-util branch from 03ccbe8 to 7153e35 Compare December 18, 2024 08:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`rustfmt`: Run on `util/*` (2/2) #3323

`rustfmt`: Run on `util/*` (2/2) #3323

tnull commented Sep 18, 2024 •

edited

Loading

codecov bot commented Sep 18, 2024 •

edited

Loading

TheBlueMatt commented Sep 18, 2024

tnull commented Sep 18, 2024

tnull commented Sep 19, 2024

tnull commented Oct 1, 2024

tnull commented Oct 7, 2024

tnull commented Nov 5, 2024 •

edited

Loading

tnull commented Nov 18, 2024

TheBlueMatt left a comment

TheBlueMatt Dec 2, 2024

tnull Dec 3, 2024

tnull commented Dec 3, 2024

tnull commented Dec 18, 2024

rustfmt: Run on util/* (2/2) #3323

Are you sure you want to change the base?

rustfmt: Run on util/* (2/2) #3323

Conversation

tnull commented Sep 18, 2024 • edited Loading

codecov bot commented Sep 18, 2024 • edited Loading

Codecov Report

TheBlueMatt commented Sep 18, 2024

tnull commented Sep 18, 2024

tnull commented Sep 19, 2024

tnull commented Oct 1, 2024

tnull commented Oct 7, 2024

tnull commented Nov 5, 2024 • edited Loading

tnull commented Nov 18, 2024

TheBlueMatt left a comment

Choose a reason for hiding this comment

TheBlueMatt Dec 2, 2024

Choose a reason for hiding this comment

tnull Dec 3, 2024

Choose a reason for hiding this comment

tnull commented Dec 3, 2024

tnull commented Dec 18, 2024

`rustfmt`: Run on `util/*` (2/2) #3323

`rustfmt`: Run on `util/*` (2/2) #3323

tnull commented Sep 18, 2024 •

edited

Loading

codecov bot commented Sep 18, 2024 •

edited

Loading

tnull commented Nov 5, 2024 •

edited

Loading