Skip to content

Commit 797993c

Browse files
authored
Merge pull request #3441 from arik-so/2024-12-lint-fixes
2 parents 726dd5c + b4f21d1 commit 797993c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ci/check-lint.sh

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ RUSTFLAGS='-D warnings' cargo clippy -- \
3535
-A clippy::len_without_is_empty \
3636
-A clippy::len_zero \
3737
-A clippy::let_and_return \
38+
-A clippy::manual_div_ceil `# to be removed once we hit MSRV 1.73.0` \
3839
-A clippy::manual_filter \
3940
-A clippy::manual_map \
4041
-A clippy::manual_memcpy \

lightning/src/ln/channelmanager.rs

-1
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,6 @@ impl Into<u16> for FailureCode {
711711
/// immediately (ie with no further calls on it made). Thus, this step happens inside a
712712
/// peer_state lock. We then return the set of things that need to be done outside the lock in
713713
/// this struct and call handle_error!() on it.
714-
715714
struct MsgHandleErrInternal {
716715
err: msgs::LightningError,
717716
closes_channel: bool,

lightning/src/onion_message/messenger.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ for OnionMessenger<ES, NS, L, NL, MR, OMH, APH, DRH, CMH> where
210210
/// &offers_message_handler, &async_payments_message_handler, &dns_resolution_message_handler,
211211
/// &custom_message_handler,
212212
/// );
213-
213+
///
214214
/// # #[derive(Debug)]
215215
/// # struct YourCustomMessage {}
216216
/// impl Writeable for YourCustomMessage {

lightning/src/sync/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mod ext_impl {
4646
}
4747
type ExclLock = MutexGuard<'a, T>;
4848
#[inline]
49-
fn unsafe_well_ordered_double_lock_self(&'a self) -> MutexGuard<T> {
49+
fn unsafe_well_ordered_double_lock_self(&'a self) -> MutexGuard<'a, T> {
5050
self.lock().unwrap()
5151
}
5252
}
@@ -57,7 +57,7 @@ mod ext_impl {
5757
}
5858
type ExclLock = RwLockWriteGuard<'a, T>;
5959
#[inline]
60-
fn unsafe_well_ordered_double_lock_self(&'a self) -> RwLockWriteGuard<T> {
60+
fn unsafe_well_ordered_double_lock_self(&'a self) -> RwLockWriteGuard<'a, T> {
6161
self.write().unwrap()
6262
}
6363
}

0 commit comments

Comments
 (0)