From eafdc58d0a8cad77542ee3f99338a1e439bdc260 Mon Sep 17 00:00:00 2001 From: Christopher Berner Date: Mon, 3 Jul 2023 10:36:03 -0700 Subject: [PATCH] Run cargo clippy --fix --- benches/decode_benchmark.rs | 9 ++++----- benches/encode_benchmark.rs | 11 ++++------- examples/main.rs | 2 +- src/constraint_matrix.rs | 12 +++++------- src/decoder.rs | 13 ++++++------- src/encoder.rs | 6 +++--- src/graph.rs | 13 ++++++------- src/matrix.rs | 4 +--- src/pi_solver.rs | 8 +++----- 9 files changed, 33 insertions(+), 45 deletions(-) diff --git a/benches/decode_benchmark.rs b/benches/decode_benchmark.rs index 7433321..2a72eeb 100644 --- a/benches/decode_benchmark.rs +++ b/benches/decode_benchmark.rs @@ -7,7 +7,7 @@ const SYMBOL_COUNTS: [usize; 10] = [10, 100, 250, 500, 1000, 2000, 5000, 10000, fn black_box(value: u64) { if value == rand::thread_rng().gen() { - println!("{}", value); + println!("{value}"); } } @@ -24,8 +24,7 @@ fn benchmark(symbol_size: u16, overhead: f64) -> u64 { let config = ObjectTransmissionInformation::new(0, symbol_size, 0, 1, 1); let encoder = SourceBlockEncoder::new2(1, &config, &data); let elements_and_overhead = (symbol_count as f64 * (1.0 + overhead)) as u32; - let mut packets = - encoder.repair_packets(0, (iterations as u32 * elements_and_overhead) as u32); + let mut packets = encoder.repair_packets(0, (iterations as u32 * elements_and_overhead)); let now = Instant::now(); for _ in 0..iterations { let mut decoder = SourceBlockDecoder::new2(1, &config, elements as u64); @@ -45,12 +44,12 @@ fn benchmark(symbol_size: u16, overhead: f64) -> u64 { throughput); } - return black_box_value; + black_box_value } fn main() { let symbol_size = 1280; - println!("Symbol size: {} bytes", symbol_size); + println!("Symbol size: {symbol_size} bytes"); black_box(benchmark(symbol_size, 0.0)); println!(); black_box(benchmark(symbol_size, 0.05)); diff --git a/benches/encode_benchmark.rs b/benches/encode_benchmark.rs index 0d6d0fb..148aedc 100644 --- a/benches/encode_benchmark.rs +++ b/benches/encode_benchmark.rs @@ -7,7 +7,7 @@ const SYMBOL_COUNTS: [usize; 10] = [10, 100, 250, 500, 1000, 2000, 5000, 10000, fn black_box(value: u64) { if value == rand::thread_rng().gen() { - println!("{}", value); + println!("{value}"); } } @@ -49,17 +49,14 @@ fn benchmark(symbol_size: u16, pre_plan: bool) -> u64 { throughput ); } - return black_box_value; + black_box_value } fn main() { let symbol_size = 1280; - println!( - "Symbol size: {} bytes (without pre-built plan)", - symbol_size - ); + println!("Symbol size: {symbol_size} bytes (without pre-built plan)"); black_box(benchmark(symbol_size, false)); println!(); - println!("Symbol size: {} bytes (with pre-built plan)", symbol_size); + println!("Symbol size: {symbol_size} bytes (with pre-built plan)"); black_box(benchmark(symbol_size, true)); } diff --git a/examples/main.rs b/examples/main.rs index 8d5a4c7..4cf916e 100644 --- a/examples/main.rs +++ b/examples/main.rs @@ -41,7 +41,7 @@ fn main() { let mut result = None; while !packets.is_empty() { result = decoder.decode(EncodingPacket::deserialize(&packets.pop().unwrap())); - if result != None { + if result.is_some() { break; } } diff --git a/src/constraint_matrix.rs b/src/constraint_matrix.rs index 7bf1a78..f22f8a4 100644 --- a/src/constraint_matrix.rs +++ b/src/constraint_matrix.rs @@ -105,7 +105,7 @@ fn generate_hdpc_rows(Kprime: usize, S: usize, H: usize) -> DenseOctetMatrix { // I_H for i in 0..H { - matrix.set(i, i + (Kprime + S) as usize, Octet::one()); + matrix.set(i, i + (Kprime + S), Octet::one()); } matrix @@ -147,7 +147,7 @@ pub fn generate_constraint_matrix( // I_S for i in 0..S { - matrix.set(i as usize, i + B as usize, Octet::one()); + matrix.set(i, i + B, Octet::one()); } // G_LDPC,2 @@ -167,7 +167,7 @@ pub fn generate_constraint_matrix( let tuple = intermediate_tuple(i, lt_symbols, sys_index, p1); for j in enc_indices(tuple, lt_symbols, pi_symbols, p1) { - matrix.set(row as usize + S + H, j, Octet::one()); + matrix.set(row + S + H, j, Octet::one()); } } @@ -251,7 +251,7 @@ mod tests { // I_H for i in 0..H { - matrix.set(i, i + (Kprime + S) as usize, Octet::one()); + matrix.set(i, i + (Kprime + S), Octet::one()); } matrix @@ -265,9 +265,7 @@ mod tests { assert_eq!( matrix1.get(i, j), matrix2.get(i, j), - "Matrices are not equal at row={} col={}", - i, - j + "Matrices are not equal at row={i} col={j}" ); } } diff --git a/src/decoder.rs b/src/decoder.rs index c8e5761..eb34b02 100644 --- a/src/decoder.rs +++ b/src/decoder.rs @@ -190,7 +190,7 @@ impl SourceBlockDecoder { let mut symbol_offset = 0; let mut sub_block_offset = 0; - for sub_block in 0..(nl + ns) as u32 { + for sub_block in 0..(nl + ns) { let bytes = if sub_block < nl { tl as usize * self.symbol_alignment as usize } else { @@ -405,7 +405,7 @@ mod codec_tests { let mut result = None; while !packets.is_empty() { result = decoder.decode(packets.pop().unwrap()); - if result != None { + if result.is_some() { break; } } @@ -449,7 +449,7 @@ mod codec_tests { let mut result = None; while !packets.is_empty() { result = decoder.decode(packets.pop().unwrap()); - if result != None { + if result.is_some() { break; } } @@ -489,7 +489,7 @@ mod codec_tests { } if progress && symbol_count % 100 == 0 { - println!("Completed {} symbols", symbol_count) + println!("Completed {symbol_count} symbols") } let config = ObjectTransmissionInformation::new(0, symbol_size as u16, 0, 1, 1); @@ -556,8 +556,7 @@ mod codec_tests { let config = ObjectTransmissionInformation::new(0, symbol_size, 0, 1, 1); let encoder = SourceBlockEncoder::new2(1, &config, &data); let elements_and_overhead = (symbol_count as f64 * (1.0 + overhead)) as u32; - let mut packets = - encoder.repair_packets(0, (iterations as u32 * elements_and_overhead) as u32); + let mut packets = encoder.repair_packets(0, (iterations as u32 * elements_and_overhead)); for _ in 0..iterations { let mut decoder = SourceBlockDecoder::new2(1, &config, elements as u64); let start = packets.len() - elements_and_overhead as usize; @@ -580,7 +579,7 @@ mod codec_tests { } if progress && symbol_count % 100 == 0 { - println!("[repair] Completed {} symbols", symbol_count) + println!("[repair] Completed {symbol_count} symbols") } }) } diff --git a/src/encoder.rs b/src/encoder.rs index d74f3f1..1e7ccbb 100644 --- a/src/encoder.rs +++ b/src/encoder.rs @@ -217,7 +217,7 @@ impl SourceBlockEncoder { // Divide the block into sub-blocks and then concatenate the sub-symbols into symbols // See second to last paragraph in section 4.4.1.2. let mut offset = 0; - for sub_block in 0..(nl + ns) as u32 { + for sub_block in 0..(nl + ns) { let bytes = if sub_block < nl { tl as usize * config.symbol_alignment() as usize } else { @@ -352,7 +352,7 @@ fn create_d( D.push(symbol.clone()); } // Extend the source block with padding. See section 5.3.2 - for _ in 0..(extended_source_symbols as usize - source_block.len()) { + for _ in 0..(extended_source_symbols - source_block.len()) { D.push(Symbol::zero(symbol_size)); } assert_eq!(D.len(), L as usize); @@ -589,7 +589,7 @@ mod tests { let encoder = Encoder::with_defaults(&data, packet_size); fn accumulate_data(acc: Vec, packet: EncodingPacket) -> Vec { - let mut updated_acc = acc.clone(); + let mut updated_acc = acc; updated_acc.extend_from_slice(packet.data()); updated_acc } diff --git a/src/graph.rs b/src/graph.rs index 31e357f..b40ddf0 100644 --- a/src/graph.rs +++ b/src/graph.rs @@ -72,8 +72,7 @@ impl ConnectedComponentGraph { if connected_component == NO_CONNECTED_COMPONENT as usize { return; } - self.connected_component_size - .decrement(connected_component as usize); + self.connected_component_size.decrement(connected_component); self.node_connected_component .insert(node, NO_CONNECTED_COMPONENT); } @@ -86,7 +85,7 @@ impl ConnectedComponentGraph { let mut max_size = 0; let mut largest_connected_component = NO_CONNECTED_COMPONENT as usize; for i in 1..=self.num_connected_components { - let size = self.connected_component_size.get(i as usize); + let size = self.connected_component_size.get(i); if size > max_size { max_size = size; largest_connected_component = i; @@ -135,11 +134,11 @@ impl ConnectedComponentGraph { // Merge into the lowest to keep chains short let merge_to = min(connected_component1, connected_component2); let merge_from = max(connected_component1, connected_component2); - let to_size = self.connected_component_size.get(merge_to as usize); - let from_size = self.connected_component_size.get(merge_from as usize); - self.connected_component_size.insert(merge_from as usize, 0); + let to_size = self.connected_component_size.get(merge_to); + let from_size = self.connected_component_size.get(merge_from); + self.connected_component_size.insert(merge_from, 0); self.connected_component_size - .insert(merge_to as usize, to_size + from_size); + .insert(merge_to, to_size + from_size); self.merged_connected_components .insert(merge_from, merge_to as u16); } diff --git a/src/matrix.rs b/src/matrix.rs index 0c2316e..f3db639 100644 --- a/src/matrix.rs +++ b/src/matrix.rs @@ -347,9 +347,7 @@ mod tests { assert_eq!( matrix1.get(i, j), matrix2.get(i, j), - "Matrices are not equal at row={} col={}", - i, - j + "Matrices are not equal at row={i} col={j}" ); } } diff --git a/src/pi_solver.rs b/src/pi_solver.rs index a98e0b7..321d8f1 100644 --- a/src/pi_solver.rs +++ b/src/pi_solver.rs @@ -328,7 +328,7 @@ impl FirstPhaseRowSelectionStats { .get_node_in_largest_connected_component(self.start_col, self.end_col); // Find a row with two ones in the given column - for row in matrix.get_ones_in_column(node as usize, start_row, end_row) { + for row in matrix.get_ones_in_column(node, start_row, end_row) { let row = row as usize; if self.ones_per_row.get(row) == 2 { return row; @@ -400,7 +400,7 @@ impl FirstPhaseRowSelectionStats { } } - if r == None { + if r.is_none() { return (None, None); } @@ -688,9 +688,7 @@ impl IntermediateSymbolDecoder { &self.A, ); - if r == None { - return None; - } + r?; let r = r.unwrap(); let chosen_row = chosen_row.unwrap(); assert!(chosen_row >= self.i);