From 17b19f14a833ac5057c6df6b35e330052ebaff14 Mon Sep 17 00:00:00 2001
From: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Date: Fri, 15 Mar 2024 15:39:45 -0400
Subject: [PATCH] Fix `clippy::needless_late_init`

Used `cargo clippy -- -A clippy::all -W clippy::needless_late_init` to find all such cases, and manually fix them

Additionally simplified logic in backward_references/hq.rs, and converted while into for loop there
---
 src/enc/backward_references/hq.rs |  3 +--
 src/enc/brotli_bit_stream.rs      | 10 ++++------
 src/enc/encode.rs                 |  9 ++++-----
 src/enc/mod.rs                    |  9 ++++-----
 src/enc/reader.rs                 |  9 ++++-----
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/enc/backward_references/hq.rs b/src/enc/backward_references/hq.rs
index 43cce368..669eec98 100644
--- a/src/enc/backward_references/hq.rs
+++ b/src/enc/backward_references/hq.rs
@@ -695,7 +695,6 @@ fn UpdateNodes<AllocF: Allocator<floatX>>(
             let backward: usize = (posdata.distance_cache[(idx & distance_cache_len_minus_1)]
                 + i32::from(kDistanceCacheOffset[j])) as usize;
             let mut prev_ix: usize = cur_ix.wrapping_sub(backward);
-            let len: usize;
             let continuation: u8 = ringbuffer[cur_ix_masked.wrapping_add(best_len)];
             if cur_ix_masked.wrapping_add(best_len) > ringbuffer_mask {
                 break;
@@ -715,7 +714,7 @@ fn UpdateNodes<AllocF: Allocator<floatX>>(
             {
                 continue;
             }
-            len = FindMatchLengthWithLimit(
+            let len = FindMatchLengthWithLimit(
                 &ringbuffer[prev_ix..],
                 &ringbuffer[cur_ix_masked..],
                 max_len,
diff --git a/src/enc/brotli_bit_stream.rs b/src/enc/brotli_bit_stream.rs
index a3c75bbd..f35c54a3 100644
--- a/src/enc/brotli_bit_stream.rs
+++ b/src/enc/brotli_bit_stream.rs
@@ -260,13 +260,11 @@ fn process_command_queue<'a, CmdProcessor: interface::CommandProcessor<'a>>(
         let copylen_code = cmd.copy_len_code();
 
         let (prev_dist_index, dist_offset) = cmd.distance_index_and_offset(&params.dist);
-        let final_distance: usize;
-        if prev_dist_index == 0 {
-            final_distance = dist_offset as usize;
+        let final_distance = if prev_dist_index == 0 {
+            dist_offset as usize
         } else {
-            final_distance =
-                (local_dist_cache[prev_dist_index - 1] as isize + dist_offset) as usize;
-        }
+            (local_dist_cache[prev_dist_index - 1] as isize + dist_offset) as usize
+        };
         let copy_len = copylen_code as usize;
         let actual_copy_len: usize;
         let max_distance = min(
diff --git a/src/enc/encode.rs b/src/enc/encode.rs
index fa83a83a..a1b1f28b 100644
--- a/src/enc/encode.rs
+++ b/src/enc/encode.rs
@@ -1596,15 +1596,14 @@ impl<Alloc: BrotliAlloc> BrotliEncoderStateStruct<Alloc> {
             let delta: u64 = self.unprocessed_input_size();
             let tail: u64 = available_in as u64;
             let limit: u32 = 1u32 << 30;
-            let total: u32;
-            if delta >= u64::from(limit)
+            let total: u32 = if delta >= u64::from(limit)
                 || tail >= u64::from(limit)
                 || delta.wrapping_add(tail) >= u64::from(limit)
             {
-                total = limit;
+                limit
             } else {
-                total = delta.wrapping_add(tail) as u32;
-            }
+                delta.wrapping_add(tail) as u32
+            };
             self.params.size_hint = total as usize;
         }
     }
diff --git a/src/enc/mod.rs b/src/enc/mod.rs
index 7593cfe8..4a24c946 100644
--- a/src/enc/mod.rs
+++ b/src/enc/mod.rs
@@ -294,12 +294,11 @@ where
                     }
                 }
             }
-            let op: BrotliEncoderOperation;
-            if available_in == 0 {
-                op = BrotliEncoderOperation::BROTLI_OPERATION_FINISH;
+            let op = if available_in == 0 {
+                BrotliEncoderOperation::BROTLI_OPERATION_FINISH
             } else {
-                op = BrotliEncoderOperation::BROTLI_OPERATION_PROCESS;
-            }
+                BrotliEncoderOperation::BROTLI_OPERATION_PROCESS
+            };
             let result = s.compress_stream(
                 op,
                 &mut available_in,
diff --git a/src/enc/reader.rs b/src/enc/reader.rs
index 746c3961..fd09c9e6 100644
--- a/src/enc/reader.rs
+++ b/src/enc/reader.rs
@@ -219,12 +219,11 @@ impl<ErrType, R: CustomRead<ErrType>, BufferType: SliceWrapperMut<u8>, Alloc: Br
                     }
                 }
             }
-            let op: BrotliEncoderOperation;
-            if avail_in == 0 {
-                op = BrotliEncoderOperation::BROTLI_OPERATION_FINISH;
+            let op = if avail_in == 0 {
+                BrotliEncoderOperation::BROTLI_OPERATION_FINISH
             } else {
-                op = BrotliEncoderOperation::BROTLI_OPERATION_PROCESS;
-            }
+                BrotliEncoderOperation::BROTLI_OPERATION_PROCESS
+            };
             let ret = self.state.0.compress_stream(
                 op,
                 &mut avail_in,