rust: second round of lint/build fixes

Author: iostat

ledger/src/proofs/transaction.rs

@@ -3850,6 +3850,10 @@ pub fn compute_witness<C: ProofConstants, F: FieldWitness>(
     let mut res: [_; COLUMNS] = std::array::from_fn(|_| vec![F::zero(); num_rows]);
 
     // public input
+    #[allow(
+        clippy::needless_range_loop,
+        reason = "Clippy incorrectly assumes we're indexing res with `i`, but we're actually not!"
+    )]
     for i in 0..public_input_size {
         res[0][i] = external_values(i);
     }

node/build.rs

@@ -192,7 +192,7 @@ fn main() -> Result<(), Box<dyn Error>> {
                         let action_name_base =
                             action_name[..(action_name.len().saturating_sub(6))].to_string();
                         let mut variant_lines = vec![];
-                        while let Some(line) = lines.next() {
+                        for line in lines.by_ref() {
                             let line = line.unwrap();
                             if line.ends_with('}') {
                                 break;

node/src/ledger/ledger_service.rs

@@ -1274,7 +1274,7 @@ impl LedgerCtx {
                 let mut iter = jobs.iter().peekable();
                 let mut res = Vec::with_capacity(jobs.len());
 
-                while let Some(job) = iter.next() {
+                for job in iter {
                     let (stmt, seq_no, job_kind, is_done) = match &job.job {
                         JobValue::Leaf(JobValueBase::Empty)
                         | JobValue::Node(JobValueMerge::Empty)

node/src/recorder/mod.rs

@@ -58,8 +58,8 @@ impl RecordedActionWithMeta<'_> {
     }
 
     pub fn as_action_with_meta(self) -> Result<ActionWithMeta, Self> {
-        if self.action.is_some() {
-            let action = self.action.unwrap().into_owned();
+        if let Some(action) = self.action {
+            let action = action.into_owned();
             Ok(self.meta.with_action(action))
         } else {
             Err(self)

p2p/libp2p-rpc-behaviour/src/state.rs

@@ -182,7 +182,7 @@ impl Inner {
         let h_id = u64::from_le_bytes(*b"RPC\x00\x00\x00\x00\x00");
         while let Some(v) = self.buffer.try_cut() {
             // TODO: proper error type
-            let (header, bytes) = v.map_err(|err| io::Error::other(err))?;
+            let (header, bytes) = v.map_err(io::Error::other)?;
             match header {
                 MessageHeader::Heartbeat => {
                     // TODO: handle heartbeat properly
@@ -195,7 +195,7 @@ impl Inner {
                     let mut bytes_slice = bytes.as_slice();
                     type P = ResponsePayload<<VersionedRpcMenuV1 as RpcMethod>::Response>;
                     let menu = P::binprot_read(&mut bytes_slice)
-                        .map_err(|err| io::Error::other(err))?
+                        .map_err(io::Error::other)?
                         .0
                         .ok()
                         .map(|NeedsLength(x)| x)

tools/testing/src/cluster/config.rs

@@ -60,7 +60,9 @@ impl ClusterConfig {
     }
 
     pub fn set_all_rust_to_rust_use_webrtc(&mut self) -> &mut Self {
-        assert!(cfg!(feature = "p2p-webrtc"));
+        if !cfg!(feature = "p2p-webrtc") {
+            unreachable!();
+        }
         self.all_rust_to_rust_use_webrtc = true;
         self
     }

tools/testing/src/service/mod.rs

@@ -186,7 +186,9 @@ impl NodeTestingService {
     }
 
     pub fn set_rust_to_rust_use_webrtc(&mut self) -> &mut Self {
-        assert!(cfg!(feature = "p2p-webrtc"));
+        if !cfg!(feature = "p2p-webrtc") {
+            unreachable!();
+        }
         self.rust_to_rust_use_webrtc = true;
         self
     }