From 243b22776e6b220efb29efd7255771abb1d9e21c Mon Sep 17 00:00:00 2001 From: Kyllingene Date: Sat, 25 Nov 2023 22:00:53 -0800 Subject: [PATCH] Removed unused files from earlier refactors --- src/arg_iter.rs | 38 -------------------------------------- src/result_iter.rs | 35 ----------------------------------- 2 files changed, 73 deletions(-) delete mode 100644 src/arg_iter.rs delete mode 100644 src/result_iter.rs diff --git a/src/arg_iter.rs b/src/arg_iter.rs deleted file mode 100644 index 00d1342..0000000 --- a/src/arg_iter.rs +++ /dev/null @@ -1,38 +0,0 @@ -/// An iterator over any remaining arguments. -/// -/// TODO: skip consumed arguments (e.g. does `-f bar` return `bar` or nothing?) -pub struct ArgumentIter<'arg, A: AsRef> { - args: &'arg [A], - i: usize, -} - -impl<'arg, A: AsRef> ArgumentIter<'arg, A> { - /// Create a new iterator over the given arguments. - pub(crate) fn new(args: &'arg [A]) -> Self { - Self { args, i: 0 } - } -} - -impl<'arg, A: AsRef> Iterator for ArgumentIter<'arg, A> { - type Item = &'arg str; - - fn next(&mut self) -> Option { - loop { - if self.i >= self.args.len() { - break None; - } - - let arg = self.args[self.i].as_ref(); - if arg == "-" || arg == "--" || !arg.starts_with('-') { - self.i += 1; - break Some(arg); - } - - self.i += 1; - } - } - - fn size_hint(&self) -> (usize, Option) { - (0, Some(self.args.len() - self.i)) - } -} diff --git a/src/result_iter.rs b/src/result_iter.rs deleted file mode 100644 index ad040bf..0000000 --- a/src/result_iter.rs +++ /dev/null @@ -1,35 +0,0 @@ -use crate::ArgumentParser; - -/// An iterator over the remainder of an argument call. -/// -/// `'a` is the lifetime of the slice of strings, while -/// `'b` is the lifetime of the strings themselves. -pub struct RemainderIter<'a, 'b> { - args: &'a [&'b str], - i: usize, -} - -impl<'a, 'b> From<&'a [&'b str]> for RemainderIter<'a, 'b> { - fn from(args: &'a [&'b str]) -> Self { - Self { - args, - i: 0, - } - } -} - -impl<'a, 'b> Iterator for RemainderIter<'a, 'b> { - type Item = &'b str; - - fn next(&mut self) -> Option { - let r = *self.args.get(self.i)?; - self.i += 1; - - if r.starts_with('-') && r != "-" && r != "--" { - None - } else { - Some(r) - } - } -} -