Merge pull request #2568 from tnull/2023-09-housekeeping

Housekeeping: fix some warning and docs

diff --combined lightning/src/ln/mod.rs
index e03190a9d8c9e0188395ae2ade899369924e7d75,824550eb3e93e7d9c82bb4d1d64c79a089410e40..beefd2d463b3ed2b938c6f82fdabef63757adccd
--- 1/lightning/src/ln/mod.rs
--- 2/lightning/src/ln/mod.rs
+++ b/lightning/src/ln/mod.rs
@@@ -13,7 -13,6 +13,6 @@@
  #[macro_use]
  pub mod functional_test_utils;
  
- pub mod channel_id;
  pub mod channelmanager;
  pub mod inbound_payment;
  pub mod msgs;
@@@ -21,6 -20,7 +20,7 @@@ pub mod peer_handler
  pub mod chan_utils;
  pub mod features;
  pub mod script;
+ mod channel_id;
  
  #[cfg(fuzzing)]
  pub mod peer_channel_encryptor;
@@@ -33,7 -33,7 +33,7 @@@ pub mod channel
  pub(crate) mod channel;
  
  // Re-export ChannelId
- pub use self::channel_id::ChannelId;
+ pub use channel_id::ChannelId;
  
  pub(crate) mod onion_utils;
  mod outbound_payment;
@@@ -43,9 -43,6 +43,9 @@@ pub mod wire
  // without the node parameter being mut. This is incorrect, and thus newer rustcs will complain
  // about an unnecessary mut. Thus, we silence the unused_mut warning in two test modules below.
  
 +#[cfg(test)]
 +#[allow(unused_mut)]
 +mod blinded_payment_tests;
  #[cfg(test)]
  #[allow(unused_mut)]
  mod functional_tests;