Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clippy::needless_late_init #156

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/enc/backward_references/hq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -715,7 +714,7 @@ fn UpdateNodes<AllocF: Allocator<floatX>>(
{
continue;
}
len = FindMatchLengthWithLimit(
let len = FindMatchLengthWithLimit(
&ringbuffer[prev_ix..],
&ringbuffer[cur_ix_masked..],
max_len,
Expand Down
10 changes: 4 additions & 6 deletions src/enc/brotli_bit_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
9 changes: 4 additions & 5 deletions src/enc/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
9 changes: 4 additions & 5 deletions src/enc/mod.rs
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 = s.compress_stream(
op,
&mut available_in,
Expand Down
9 changes: 4 additions & 5 deletions src/enc/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down