Skip to content

Commit 930f5fb

Browse files
committed
Only attempt to rustfmt files checked into git
This avoids `rustfmt` failing on Rust files generated by dependent crates in `target`, eg ``` + rustfmt --edition 2021 --check ./target/debug/build/thiserror-8230374e07b5c05a/out/probe.rs Diff in /home/matt/rust-lightning-3/target/debug/build/thiserror-8230374e07b5c05a/out/probe.rs at line 1: - #![feature(provide_any)] +#![feature(provide_any)] - use std::any::{Demand, Provider}; +use std::any::{Demand, Provider}; - fn _f<'a, P: Provider>(p: &'a P, demand: &mut Demand<'a>) { - p.provide(demand); - } +fn _f<'a, P: Provider>(p: &'a P, demand: &mut Demand<'a>) { + p.provide(demand); +} ```
1 parent cdd1298 commit 930f5fb

File tree

3 files changed

+98
-98
lines changed

3 files changed

+98
-98
lines changed

ci/rustfmt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ VERS=""
1414

1515
# Run fmt
1616
TMP_FILE=$(mktemp)
17-
find . -name '*.rs' -type f |sort >"$TMP_FILE"
17+
git ls-files | grep '.rs$' | sort >"$TMP_FILE"
1818
for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
1919
echo "Checking formatting of $file"
2020
rustfmt $VERS --edition 2021 --check "$file"

contrib/run-rustfmt.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ VERS=""
1414

1515
# Run fmt
1616
TMP_FILE=$(mktemp)
17-
find . -name '*.rs' -type f |sort >"$TMP_FILE"
17+
git ls-files | grep '.rs$' | sort >"$TMP_FILE"
1818
for file in $(comm -23 "$TMP_FILE" rustfmt_excluded_files); do
1919
echo "Formatting $file..."
2020
rustfmt $VERS --edition 2021 "$file"

rustfmt_excluded_files

+96-96
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
./lightning-invoice/fuzz/fuzz_targets/serde_data_part.rs
2-
./lightning-invoice/src/de.rs
3-
./lightning-invoice/src/lib.rs
4-
./lightning-invoice/src/payment.rs
5-
./lightning-invoice/src/ser.rs
6-
./lightning-invoice/src/tb.rs
7-
./lightning-invoice/src/utils.rs
8-
./lightning-invoice/tests/ser_de.rs
9-
./lightning/src/blinded_path/message.rs
10-
./lightning/src/blinded_path/mod.rs
11-
./lightning/src/blinded_path/payment.rs
12-
./lightning/src/blinded_path/utils.rs
13-
./lightning/src/chain/chaininterface.rs
14-
./lightning/src/chain/chainmonitor.rs
15-
./lightning/src/chain/channelmonitor.rs
16-
./lightning/src/chain/mod.rs
17-
./lightning/src/chain/onchaintx.rs
18-
./lightning/src/chain/package.rs
19-
./lightning/src/chain/transaction.rs
20-
./lightning/src/events/bump_transaction.rs
21-
./lightning/src/events/mod.rs
22-
./lightning/src/lib.rs
23-
./lightning/src/ln/async_signer_tests.rs
24-
./lightning/src/ln/blinded_payment_tests.rs
25-
./lightning/src/ln/chan_utils.rs
26-
./lightning/src/ln/chanmon_update_fail_tests.rs
27-
./lightning/src/ln/channel.rs
28-
./lightning/src/ln/channel_id.rs
29-
./lightning/src/ln/channelmanager.rs
30-
./lightning/src/ln/features.rs
31-
./lightning/src/ln/functional_test_utils.rs
32-
./lightning/src/ln/functional_tests.rs
33-
./lightning/src/ln/inbound_payment.rs
34-
./lightning/src/ln/invoice_utils.rs
35-
./lightning/src/ln/max_payment_path_len_tests.rs
36-
./lightning/src/ln/mod.rs
37-
./lightning/src/ln/monitor_tests.rs
38-
./lightning/src/ln/msgs.rs
39-
./lightning/src/ln/offers_tests.rs
40-
./lightning/src/ln/onion_payment.rs
41-
./lightning/src/ln/onion_route_tests.rs
42-
./lightning/src/ln/outbound_payment.rs
43-
./lightning/src/ln/payment_tests.rs
44-
./lightning/src/ln/peer_channel_encryptor.rs
45-
./lightning/src/ln/peer_handler.rs
46-
./lightning/src/ln/priv_short_conf_tests.rs
47-
./lightning/src/ln/reload_tests.rs
48-
./lightning/src/ln/reorg_tests.rs
49-
./lightning/src/ln/script.rs
50-
./lightning/src/ln/shutdown_tests.rs
51-
./lightning/src/ln/types.rs
52-
./lightning/src/ln/wire.rs
53-
./lightning/src/offers/invoice.rs
54-
./lightning/src/offers/invoice_error.rs
55-
./lightning/src/offers/invoice_request.rs
56-
./lightning/src/offers/merkle.rs
57-
./lightning/src/offers/mod.rs
58-
./lightning/src/offers/offer.rs
59-
./lightning/src/offers/parse.rs
60-
./lightning/src/offers/payer.rs
61-
./lightning/src/offers/refund.rs
62-
./lightning/src/offers/signer.rs
63-
./lightning/src/offers/test_utils.rs
64-
./lightning/src/onion_message/functional_tests.rs
65-
./lightning/src/onion_message/messenger.rs
66-
./lightning/src/onion_message/mod.rs
67-
./lightning/src/onion_message/offers.rs
68-
./lightning/src/onion_message/packet.rs
69-
./lightning/src/routing/gossip.rs
70-
./lightning/src/routing/mod.rs
71-
./lightning/src/routing/router.rs
72-
./lightning/src/routing/scoring.rs
73-
./lightning/src/routing/test_utils.rs
74-
./lightning/src/routing/utxo.rs
75-
./lightning/src/util/atomic_counter.rs
76-
./lightning/src/util/base32.rs
77-
./lightning/src/util/byte_utils.rs
78-
./lightning/src/util/config.rs
79-
./lightning/src/util/errors.rs
80-
./lightning/src/util/fuzz_wrappers.rs
81-
./lightning/src/util/indexed_map.rs
82-
./lightning/src/util/invoice.rs
83-
./lightning/src/util/logger.rs
84-
./lightning/src/util/macro_logger.rs
85-
./lightning/src/util/message_signing.rs
86-
./lightning/src/util/mod.rs
87-
./lightning/src/util/persist.rs
88-
./lightning/src/util/scid_utils.rs
89-
./lightning/src/util/ser.rs
90-
./lightning/src/util/ser_macros.rs
91-
./lightning/src/util/string.rs
92-
./lightning/src/util/test_channel_signer.rs
93-
./lightning/src/util/test_utils.rs
94-
./lightning/src/util/time.rs
95-
./lightning/src/util/transaction_utils.rs
96-
./lightning/src/util/wakers.rs
1+
lightning-invoice/fuzz/fuzz_targets/serde_data_part.rs
2+
lightning-invoice/src/de.rs
3+
lightning-invoice/src/lib.rs
4+
lightning-invoice/src/payment.rs
5+
lightning-invoice/src/ser.rs
6+
lightning-invoice/src/tb.rs
7+
lightning-invoice/src/utils.rs
8+
lightning-invoice/tests/ser_de.rs
9+
lightning/src/blinded_path/message.rs
10+
lightning/src/blinded_path/mod.rs
11+
lightning/src/blinded_path/payment.rs
12+
lightning/src/blinded_path/utils.rs
13+
lightning/src/chain/chaininterface.rs
14+
lightning/src/chain/chainmonitor.rs
15+
lightning/src/chain/channelmonitor.rs
16+
lightning/src/chain/mod.rs
17+
lightning/src/chain/onchaintx.rs
18+
lightning/src/chain/package.rs
19+
lightning/src/chain/transaction.rs
20+
lightning/src/events/bump_transaction.rs
21+
lightning/src/events/mod.rs
22+
lightning/src/lib.rs
23+
lightning/src/ln/async_signer_tests.rs
24+
lightning/src/ln/blinded_payment_tests.rs
25+
lightning/src/ln/chan_utils.rs
26+
lightning/src/ln/chanmon_update_fail_tests.rs
27+
lightning/src/ln/channel.rs
28+
lightning/src/ln/channel_id.rs
29+
lightning/src/ln/channelmanager.rs
30+
lightning/src/ln/features.rs
31+
lightning/src/ln/functional_test_utils.rs
32+
lightning/src/ln/functional_tests.rs
33+
lightning/src/ln/inbound_payment.rs
34+
lightning/src/ln/invoice_utils.rs
35+
lightning/src/ln/max_payment_path_len_tests.rs
36+
lightning/src/ln/mod.rs
37+
lightning/src/ln/monitor_tests.rs
38+
lightning/src/ln/msgs.rs
39+
lightning/src/ln/offers_tests.rs
40+
lightning/src/ln/onion_payment.rs
41+
lightning/src/ln/onion_route_tests.rs
42+
lightning/src/ln/outbound_payment.rs
43+
lightning/src/ln/payment_tests.rs
44+
lightning/src/ln/peer_channel_encryptor.rs
45+
lightning/src/ln/peer_handler.rs
46+
lightning/src/ln/priv_short_conf_tests.rs
47+
lightning/src/ln/reload_tests.rs
48+
lightning/src/ln/reorg_tests.rs
49+
lightning/src/ln/script.rs
50+
lightning/src/ln/shutdown_tests.rs
51+
lightning/src/ln/types.rs
52+
lightning/src/ln/wire.rs
53+
lightning/src/offers/invoice.rs
54+
lightning/src/offers/invoice_error.rs
55+
lightning/src/offers/invoice_request.rs
56+
lightning/src/offers/merkle.rs
57+
lightning/src/offers/mod.rs
58+
lightning/src/offers/offer.rs
59+
lightning/src/offers/parse.rs
60+
lightning/src/offers/payer.rs
61+
lightning/src/offers/refund.rs
62+
lightning/src/offers/signer.rs
63+
lightning/src/offers/test_utils.rs
64+
lightning/src/onion_message/functional_tests.rs
65+
lightning/src/onion_message/messenger.rs
66+
lightning/src/onion_message/mod.rs
67+
lightning/src/onion_message/offers.rs
68+
lightning/src/onion_message/packet.rs
69+
lightning/src/routing/gossip.rs
70+
lightning/src/routing/mod.rs
71+
lightning/src/routing/router.rs
72+
lightning/src/routing/scoring.rs
73+
lightning/src/routing/test_utils.rs
74+
lightning/src/routing/utxo.rs
75+
lightning/src/util/atomic_counter.rs
76+
lightning/src/util/base32.rs
77+
lightning/src/util/byte_utils.rs
78+
lightning/src/util/config.rs
79+
lightning/src/util/errors.rs
80+
lightning/src/util/fuzz_wrappers.rs
81+
lightning/src/util/indexed_map.rs
82+
lightning/src/util/invoice.rs
83+
lightning/src/util/logger.rs
84+
lightning/src/util/macro_logger.rs
85+
lightning/src/util/message_signing.rs
86+
lightning/src/util/mod.rs
87+
lightning/src/util/persist.rs
88+
lightning/src/util/scid_utils.rs
89+
lightning/src/util/ser.rs
90+
lightning/src/util/ser_macros.rs
91+
lightning/src/util/string.rs
92+
lightning/src/util/test_channel_signer.rs
93+
lightning/src/util/test_utils.rs
94+
lightning/src/util/time.rs
95+
lightning/src/util/transaction_utils.rs
96+
lightning/src/util/wakers.rs

0 commit comments

Comments
 (0)