Fixed tests + cargo fmt

README.md

@@ -269,7 +269,7 @@ fn main() {
         "Hello World !".to_string(),
     ];
 
-    let (args, _) = Args::parse_provided(&arguments, None.into_iter()).expect("failed to parse arguments");
+    let (args, _) = Args::parse_provided(&arguments, None::<(&str, &str)>).expect("failed to parse arguments");
 
     assert_eq!(
         args.my_argument,

src/lib.rs

@@ -210,7 +210,10 @@ impl ArgumentReader {
     /// # Errors
     ///
     /// See [`parse`](ArgumentReader::parse) for details.
-    fn parse_cli<A: AsRef<str>, IA: IntoIterator<Item = A>>(mut self, args: IA) -> Result<Arguments, ArgParseError> {
+    fn parse_cli<A: AsRef<str>, IA: IntoIterator<Item = A>>(
+        mut self,
+        args: IA,
+    ) -> Result<Arguments, ArgParseError> {
         fn tostring<S: AsRef<str>>(arg: S) -> String {
             <S as AsRef<str>>::as_ref(&arg).to_string()
         }

src/macros.rs

@@ -168,8 +168,8 @@ macro_rules! __var_tag {
 ///     ];
 ///
 ///     let env = [
-///         "ENV_VAR", "42",
-///         "BAZ", "4,5,6",   // ...and this one.
+///         ("ENV_VAR", "42"),
+///         ("BAZ", "4,5,6"), // ...and this one.
 ///     ];
 ///
 ///     // Normally, you would use `::parse()` here. However, since this gets run

src/test.rs

@@ -5,27 +5,13 @@ mod custom_type;
 #[cfg(feature = "macros")]
 mod macros;
 
-#[allow(unused)]
-macro_rules! create_args {
-    ( $( $arg:expr ),* $(,)? ) => {
-        [ $( $arg.to_string(), )* ]
-    };
-}
-
-#[allow(unused)]
-macro_rules! create_env {
-    ( $( $name:expr, $val:expr ),* $(,)? ) => {
-        [ $( ($name.to_string(), $val.to_string()), )* ]
-    };
-}
-
 #[test]
 fn basic_arg_test() {
     let mut parser = ArgumentReader::new();
     let name = parser.add(tag::long("name"));
     let help = parser.add(tag::short('h'));
 
-    let args = create_args!["test", "--name", "Jonah"];
+    let args = ["test", "--name", "Jonah"];
 
     let args = parser
         .clone()
@@ -36,7 +22,7 @@ fn basic_arg_test() {
     assert_eq!(name.get(&args), Some(Ok("Jonah".to_string())));
     assert_eq!(help.get(&args), Some(Ok(false)));
 
-    let args = create_args!["test", "-h", "Jonah"];
+    let args = ["test", "-h", "Jonah"];
 
     let args = parser
         .parse_cli(args)
@@ -55,7 +41,7 @@ fn multiple_short() {
     let c = parser.add(tag::short('c'));
     let d = parser.add(tag::short('d'));
 
-    let args = create_args!["test", "-abc"];
+    let args = ["test", "-abc"];
     let args = parser.parse_cli(args).expect("Failed to parse args");
 
     assert_eq!(a.get(&args), Some(Ok(true)));
@@ -72,7 +58,7 @@ fn multiple_short_vals() {
     let c = parser.add(tag::short('c'));
     let d = parser.add::<i64>(tag::short('d'));
 
-    let args = create_args!["test", "-abc", "test"];
+    let args = ["test", "-abc", "test"];
 
     let args = parser.parse_cli(args).expect("Failed to parse args");
 
@@ -91,7 +77,7 @@ fn multiple_short_vals_consume_same_value() {
     let _c = parser.add::<String>(tag::short('c'));
     let _d = parser.add::<String>(tag::short('d'));
 
-    let args = create_args!["test", "-abcd", "test"];
+    let args = ["test", "-abcd", "test"];
 
     parser.parse_cli(args).unwrap();
 }
@@ -101,7 +87,7 @@ fn list_type() {
     let mut parser = ArgumentReader::new();
     let list = parser.add(tag::long("list"));
 
-    let args = create_args!["test", "--list", "Hello,World,!",];
+    let args = ["test", "--list", "Hello,World,!"];
 
     let args = parser.parse_cli(args).expect("failed to parse arguments");
 
@@ -120,7 +106,7 @@ fn int_list_type() {
     let mut parser = ArgumentReader::new();
     let list = parser.add(tag::long("list"));
 
-    let args = create_args!["test", "--list", "123,456,789",];
+    let args = ["test", "--list", "123,456,789"];
 
     let args = parser.parse_cli(args).expect("failed to parse arguments");
 
@@ -132,7 +118,7 @@ fn basic_env_var() {
     let mut parser = ArgumentReader::new();
     let cfg = parser.add(tag::env("CONFIG_DIR"));
 
-    let args = create_env!["CONFIG_DIR", "/cfg"];
+    let args = [("CONFIG_DIR", "/cfg")];
 
     let args = parser
         .parse_provided(&[] as &[String], args)
@@ -149,7 +135,7 @@ fn many_env_vars() {
     let threads = parser.add(tag::env("THREADS"));
     let unused = parser.add::<i64>(tag::env("UNUSED"));
 
-    let args = create_env!["CONFIG_DIR", "/cfg", "SILENT", "0", "THREADS", "16",];
+    let args = [("CONFIG_DIR", "/cfg"), ("SILENT", "0"), ("THREADS", "16")];
 
     let args = parser
         .parse_provided(&[] as &[String], args)
@@ -160,4 +146,3 @@ fn many_env_vars() {
     assert_eq!(threads.get(&args), Some(Ok(16u64)));
     assert_eq!(unused.get(&args), None);
 }
-