Skip to content

Commit

Permalink
refactor: Remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed May 12, 2022
1 parent 740bb39 commit cf0282b
Showing 1 changed file with 1 addition and 171 deletions.
172 changes: 1 addition & 171 deletions src/parser/matches/matched_arg.rs
Expand Up @@ -52,6 +52,7 @@ impl MatchedArg {
self.indices.push(index)
}

#[cfg(feature = "unstable-grouped")]
pub(crate) fn vals(&self) -> Iter<Vec<OsString>> {
self.vals.iter()
}
Expand Down Expand Up @@ -95,29 +96,6 @@ impl MatchedArg {
!self.vals.is_empty()
}

// Will be used later
#[allow(dead_code)]
pub(crate) fn remove_vals(&mut self, len: usize) {
let mut want_remove = len;
let mut remove_group = None;
let mut remove_val = None;
for (i, g) in self.vals().enumerate() {
if g.len() <= want_remove {
want_remove -= g.len();
remove_group = Some(i);
} else {
remove_val = Some(want_remove);
break;
}
}
if let Some(remove_group) = remove_group {
self.vals.drain(0..=remove_group);
}
if let Some(remove_val) = remove_val {
self.vals[0].drain(0..remove_val);
}
}

pub(crate) fn check_explicit(&self, predicate: ArgPredicate) -> bool {
if self.ty == Some(ValueSource::DefaultValue) {
return false;
Expand Down Expand Up @@ -214,152 +192,4 @@ mod tests {
]
)
}

#[test]
fn test_grouped_vals_removal() {
let m = {
let mut m = MatchedArg::new();
m.push_val("aaa".into());
m.new_val_group();
m.append_val("bbb".into());
m.append_val("ccc".into());
m.new_val_group();
m.append_val("ddd".into());
m.push_val("eee".into());
m.new_val_group();
m.append_val("fff".into());
m.append_val("ggg".into());
m.append_val("hhh".into());
m.append_val("iii".into());
m
};
{
let mut m = m.clone();
m.remove_vals(0);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![
&vec![OsString::from("aaa")],
&vec![OsString::from("bbb"), OsString::from("ccc"),],
&vec![OsString::from("ddd")],
&vec![OsString::from("eee")],
&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]
]
);
}

{
let mut m = m.clone();
m.remove_vals(1);
let vals0 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals0,
vec![
&vec![OsString::from("bbb"), OsString::from("ccc"),],
&vec![OsString::from("ddd")],
&vec![OsString::from("eee")],
&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]
]
);
}

{
let mut m = m.clone();
m.remove_vals(2);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![
&vec![OsString::from("ccc"),],
&vec![OsString::from("ddd")],
&vec![OsString::from("eee")],
&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]
]
);
}

{
let mut m = m.clone();
m.remove_vals(3);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![
&vec![OsString::from("ddd")],
&vec![OsString::from("eee")],
&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]
]
);
}

{
let mut m = m.clone();
m.remove_vals(4);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![
&vec![OsString::from("eee")],
&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]
]
);
}

{
let mut m = m.clone();
m.remove_vals(5);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![&vec![
OsString::from("fff"),
OsString::from("ggg"),
OsString::from("hhh"),
OsString::from("iii"),
]]
);
}

{
let mut m = m.clone();
m.remove_vals(7);
let vals1 = m.vals().collect::<Vec<_>>();
assert_eq!(
vals1,
vec![&vec![OsString::from("hhh"), OsString::from("iii"),]]
);
}

{
let mut m = m;
m.remove_vals(9);
assert_eq!(m.vals().next(), None);
}
}
}

0 comments on commit cf0282b

Please sign in to comment.