cleanup: refer to args as flags consistently

pull/312/head
Davide Bertola 3 years ago
parent cffff273a1
commit fcf829ed3c

@ -105,13 +105,13 @@ fn c_header_from_btf(path: &Path) -> Result<String, Error> {
} }
fn combine_flags(s1: &[String], s2: &[String]) -> Vec<String> { fn combine_flags(s1: &[String], s2: &[String]) -> Vec<String> {
let mut args = Vec::new(); let mut flags = Vec::new();
let mut extra = Vec::new(); let mut extra = Vec::new();
for s in [s1, s2] { for s in [s1, s2] {
let mut s = s.splitn(2, |el| el == "--"); let mut s = s.splitn(2, |el| el == "--");
// append args // append args
args.extend(s.next().unwrap().iter().cloned()); flags.extend(s.next().unwrap().iter().cloned());
if let Some(e) = s.next() { if let Some(e) = s.next() {
// append extra args // append extra args
extra.extend(e.iter().cloned()); extra.extend(e.iter().cloned());
@ -120,11 +120,11 @@ fn combine_flags(s1: &[String], s2: &[String]) -> Vec<String> {
// append extra args // append extra args
if !extra.is_empty() { if !extra.is_empty() {
args.push("--".to_string()); flags.push("--".to_string());
args.extend(extra); flags.extend(extra);
} }
args flags
} }
#[cfg(test)] #[cfg(test)]

Loading…
Cancel
Save