Skip to content

Commit

Permalink
Fix clippy::needless_late_init
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@nyurik
nyurik committed Mar 18, 2024
1 parent 6fae4d3 commit 8bebfce
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 81 deletions.
100 changes: 45 additions & 55 deletions src/enc/backward_references/hq.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,74 +775,64 @@ fn UpdateNodes<AllocF: Allocator<floatX>>(
+ 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 'break29;
}
if backward > max_distance.wrapping_add(gap) {
break 'continue30;
}
if backward <= max_distance {
if prev_ix >= cur_ix {
break 'continue30;
}
prev_ix &= ringbuffer_mask;
if prev_ix.wrapping_add(best_len) > ringbuffer_mask
|| continuation as i32
!= ringbuffer[(prev_ix.wrapping_add(best_len) as usize)]
as i32
{
break 'continue30;
}
len = FindMatchLengthWithLimit(
&ringbuffer[(prev_ix as usize)..],
&ringbuffer[cur_ix_masked..],
max_len,
);
} else {
if backward > max_distance {
break 'continue30;
}

if prev_ix >= cur_ix {
break 'continue30;
}
prev_ix &= ringbuffer_mask;
if prev_ix.wrapping_add(best_len) > ringbuffer_mask
|| continuation as i32
!= ringbuffer[prev_ix.wrapping_add(best_len)] as i32
{
let dist_cost: floatX =
base_cost + ZopfliCostModelGetDistanceCost(model, j);
let mut l: usize;
l = best_len.wrapping_add(1);
while l <= len {
break 'continue30;
}

let dist_cost = base_cost + ZopfliCostModelGetDistanceCost(model, j);
let len = FindMatchLengthWithLimit(
&ringbuffer[prev_ix..],
&ringbuffer[cur_ix_masked..],
max_len,
);
for l in best_len.wrapping_add(1)..=len {
{
let copycode: u16 = GetCopyLengthCode(l);
let cmdcode: u16 =
CombineLengthCodes(inscode, copycode, (j == 0usize) as i32);
let cost: floatX = (if (cmdcode as i32) < 128i32 {
base_cost
} else {
dist_cost
}) + GetCopyExtra(copycode) as (floatX)
+ ZopfliCostModelGetCommandCost(model, cmdcode);
if cost
< match (nodes[pos.wrapping_add(l)]).u {
Union1::cost(cost) => cost,
_ => 0.0,
}
{
let copycode: u16 = GetCopyLengthCode(l);
let cmdcode: u16 = CombineLengthCodes(
inscode,
copycode,
(j == 0usize) as i32,
UpdateZopfliNode(
nodes,
pos,
start,
l,
l,
backward,
j.wrapping_add(1),
cost,
);
let cost: floatX = (if (cmdcode as i32) < 128i32 {
base_cost
} else {
dist_cost
}) + GetCopyExtra(copycode) as (floatX)
+ ZopfliCostModelGetCommandCost(model, cmdcode);
if cost
< match (nodes[pos.wrapping_add(l)]).u {
Union1::cost(cost) => cost,
_ => 0.0,
}
{
UpdateZopfliNode(
nodes,
pos,
start,
l,
l,
backward,
j.wrapping_add(1),
cost,
);
result = brotli_max_size_t(result, l);
}
best_len = l;
result = brotli_max_size_t(result, l);
}
l = l.wrapping_add(1);
best_len = l;
}
}
}
Expand Down
19 changes: 8 additions & 11 deletions src/enc/brotli_bit_stream.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,11 @@ fn process_command_queue<'a, CmdProcessor: interface::CommandProcessor<'a>>(
let copylen_code: u32 = CommandCopyLenCode(cmd);

let (prev_dist_index, dist_offset) = CommandDistanceIndexAndOffset(cmd, &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 = core::cmp::min(
Expand Down Expand Up @@ -1413,12 +1411,11 @@ fn NewBlockEncoder<'a, Alloc: alloc::Allocator<u8> + alloc::Allocator<u16>>(
block_lengths: &'a [u32],
num_blocks: usize,
) -> BlockEncoder<'a, Alloc> {
let block_len: usize;
if num_blocks != 0 && !block_lengths.is_empty() {
block_len = block_lengths[0] as usize;
let block_len = if num_blocks != 0 && !block_lengths.is_empty() {
block_lengths[0] as usize
} else {
block_len = 0;
}
0
};
BlockEncoder::<Alloc> {
histogram_length_: histogram_length,
num_block_types_: num_block_types,
Expand Down
9 changes: 4 additions & 5 deletions src/enc/encode.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1660,15 +1660,14 @@ fn UpdateSizeHint<Alloc: BrotliAlloc>(
let delta: u64 = UnprocessedInputSize(s);
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
};
s.params.size_hint = total as usize;
}
}
Expand Down
9 changes: 4 additions & 5 deletions src/enc/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = BrotliEncoderCompressStream(
s,
op,
Expand Down
9 changes: 4 additions & 5 deletions src/enc/reader.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,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 = BrotliEncoderCompressStream(
&mut self.state.0,
op,
Expand Down

0 comments on commit 8bebfce

Please sign in to comment.