From ca643792fd49873c30e6edaccab87c53bbcd0e48 Mon Sep 17 00:00:00 2001 From: Arvin Morawej Date: Fri, 14 Feb 2025 13:33:11 -0500 Subject: [PATCH] fix: Improve UPD port list handling, unnecessary `.clone()` --- build.rs | 14 +++++++------- src/generated.rs | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.rs b/build.rs index 410ffeb8e..9090b3f25 100644 --- a/build.rs +++ b/build.rs @@ -119,21 +119,22 @@ fn generate_code(port_payload_map: BTreeMap, Vec>) { /// A BTreeMap where keys are line numbers and values are vectors of ports fn ports_v(fp_map: &BTreeMap) -> BTreeMap> { let mut pb_linenr: BTreeMap> = BTreeMap::new(); - let mut port_list: Vec = Vec::new(); for (&line_nr, ports) in fp_map { + let mut port_list: Vec = Vec::new(); + if ports.contains("udp ") { let remain = &ports[4..]; let mut start = remain.split(' '); let ports = start.next().unwrap(); - let port_segments: Vec<&str> = ports.split(',').collect(); + let port_segments = ports.split(','); for segment in port_segments { if segment.contains('-') { - let range: Vec<&str> = segment.trim().split('-').collect(); - let start = range[0].parse::().unwrap(); - let end = range[1].parse::().unwrap(); + let mut range = segment.trim().split('-'); + let start = range.next().unwrap().parse::().unwrap(); + let end = range.next().unwrap().parse::().unwrap(); for port in start..end { port_list.push(port); @@ -147,8 +148,7 @@ fn ports_v(fp_map: &BTreeMap) -> BTreeMap> { } } - pb_linenr.insert(line_nr, port_list.clone()); - port_list.clear(); + pb_linenr.insert(line_nr, port_list); } pb_linenr diff --git a/src/generated.rs b/src/generated.rs index 29d421810..0313c23b6 100644 --- a/src/generated.rs +++ b/src/generated.rs @@ -2816,9 +2816,8 @@ fn generated_data() -> BTreeMap, Vec> { map.insert( vec![161, 260, 3401], vec![ - 48, 58, 2, 1, 3, 48, 15, 2, 2, 74, 105, 2, 3, 0, 255, 227, 4, 1, 4, 2, 1, 3, 4, 16, 48, - 14, 4, 0, 2, 1, 0, 2, 1, 0, 4, 0, 4, 0, 4, 0, 48, 18, 4, 0, 4, 0, 160, 12, 2, 2, 55, - 240, 2, 1, 0, 2, 1, 0, 48, 0, + 48, 31, 2, 1, 0, 4, 6, 188, 161, 18, 2, 1, 0, 2, 1, 0, 2, 1, 0, 48, 7, 48, 5, 6, 1, 0, + 5, 0, ], ); map.insert(vec![177], vec![0, 1, 0, 2, 0, 1, 0]);