diff --git a/examples/arg_enum_basic.rs b/examples/arg_enum_basic.rs index 46bce168..d691ca39 100644 --- a/examples/arg_enum_basic.rs +++ b/examples/arg_enum_basic.rs @@ -1,7 +1,9 @@ -#[macro_use] -extern crate clap; +// #[macro_use] +// extern crate clap; -use clap::{App, Arg}; +// use clap::{App, Arg}; + +fn main() {} // #[derive(ArgEnum, Debug)] // enum ArgChoice { diff --git a/examples/arg_enum_case_sensitive.rs b/examples/arg_enum_case_sensitive.rs index ab2f7763..2e3e2f5d 100644 --- a/examples/arg_enum_case_sensitive.rs +++ b/examples/arg_enum_case_sensitive.rs @@ -1,27 +1,28 @@ -#[macro_use] -extern crate clap; +fn main() {} +// #[macro_use] +// extern crate clap; -use clap::{App, Arg}; +// use clap::{App, Arg}; -#[derive(ArgEnum, Debug)] -#[case_sensitive] -enum ArgChoice { - Foo, - Bar, - Baz, -} +// #[derive(ArgEnum, Debug)] +// #[case_sensitive] +// enum ArgChoice { +// Foo, +// Bar, +// Baz, +// } -fn main() { - let matches = App::new(env!("CARGO_PKG_NAME")) - .arg( - Arg::with_name("arg") - .required(true) - .takes_value(true) - .possible_values(&ArgChoice::variants()), - ) - .get_matches(); +// fn main() { +// let matches = App::new(env!("CARGO_PKG_NAME")) +// .arg( +// Arg::with_name("arg") +// .required(true) +// .takes_value(true) +// .possible_values(&ArgChoice::variants()), +// ) +// .get_matches(); - let t = value_t!(matches.value_of("arg"), ArgChoice).unwrap_or_else(|e| e.exit()); +// let t = value_t!(matches.value_of("arg"), ArgChoice).unwrap_or_else(|e| e.exit()); - println!("{:?}", t); -} +// println!("{:?}", t); +// } diff --git a/src/lib.rs b/src/lib.rs index fc79f242..1c9ad92b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -25,12 +25,12 @@ extern crate proc_macro2; mod derives; -/// It is required to have this seperate and specificly defined. -#[proc_macro_derive(ArgEnum, attributes(case_sensitive))] -pub fn arg_enum(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - let input: syn::DeriveInput = syn::parse(input).unwrap(); - derives::derive_arg_enum(&input).into() -} +// /// It is required to have this seperate and specificly defined. +// #[proc_macro_derive(ArgEnum, attributes(case_sensitive))] +// pub fn arg_enum(input: proc_macro::TokenStream) -> proc_macro::TokenStream { +// let input: syn::DeriveInput = syn::parse(input).unwrap(); +// derives::derive_arg_enum(&input).into() +// } /// Generates the `Clap` impl. #[proc_macro_derive(Clap, attributes(clap))] diff --git a/tests/arg_enum_basic.rs b/tests/arg_enum_basic.rs index 53d8ac3e..5d6ce1f1 100644 --- a/tests/arg_enum_basic.rs +++ b/tests/arg_enum_basic.rs @@ -1,54 +1,54 @@ -// Copyright 2018 Guillaume Pinot (@TeXitoi) , -// Kevin Knapp (@kbknapp) , and -// Andrew Hobden (@hoverbear) -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. -#[macro_use] -extern crate clap; -#[macro_use] -extern crate clap_derive; +// // Copyright 2018 Guillaume Pinot (@TeXitoi) , +// // Kevin Knapp (@kbknapp) , and +// // Andrew Hobden (@hoverbear) +// // +// // Licensed under the Apache License, Version 2.0 or the MIT license +// // , at your +// // option. This file may not be copied, modified, or distributed +// // except according to those terms. +// #[macro_use] +// extern crate clap; +// #[macro_use] +// extern crate clap_derive; -use clap::{App, Arg}; +// use clap::{App, Arg}; -#[derive(ArgEnum, Debug, PartialEq)] -enum ArgChoice { - Foo, - Bar, - Baz, -} +// #[derive(ArgEnum, Debug, PartialEq)] +// enum ArgChoice { +// Foo, +// Bar, +// Baz, +// } -#[test] -fn when_lowercase() { - let matches = App::new(env!("CARGO_PKG_NAME")) - .arg( - Arg::with_name("arg") - .required(true) - .takes_value(true) - .possible_values(&ArgChoice::variants()), - ) - .get_matches_from_safe(vec!["", "foo"]) - .unwrap(); - let t = value_t!(matches.value_of("arg"), ArgChoice); - assert!(t.is_ok()); - assert_eq!(t.unwrap(), ArgChoice::Foo); -} +// #[test] +// fn when_lowercase() { +// let matches = App::new(env!("CARGO_PKG_NAME")) +// .arg( +// Arg::with_name("arg") +// .required(true) +// .takes_value(true) +// .possible_values(&ArgChoice::variants()), +// ) +// .get_matches_from_safe(vec!["", "foo"]) +// .unwrap(); +// let t = value_t!(matches.value_of("arg"), ArgChoice); +// assert!(t.is_ok()); +// assert_eq!(t.unwrap(), ArgChoice::Foo); +// } -#[test] -fn when_capitalized() { - let matches = App::new(env!("CARGO_PKG_NAME")) - .arg( - Arg::with_name("arg") - .required(true) - .takes_value(true) - .possible_values(&ArgChoice::variants()), - ) - .get_matches_from_safe(vec!["", "Foo"]) - .unwrap(); - let t = value_t!(matches.value_of("arg"), ArgChoice); - assert!(t.is_ok()); - assert_eq!(t.unwrap(), ArgChoice::Foo); -} +// #[test] +// fn when_capitalized() { +// let matches = App::new(env!("CARGO_PKG_NAME")) +// .arg( +// Arg::with_name("arg") +// .required(true) +// .takes_value(true) +// .possible_values(&ArgChoice::variants()), +// ) +// .get_matches_from_safe(vec!["", "Foo"]) +// .unwrap(); +// let t = value_t!(matches.value_of("arg"), ArgChoice); +// assert!(t.is_ok()); +// assert_eq!(t.unwrap(), ArgChoice::Foo); +// } diff --git a/tests/arg_enum_case_sensitive.rs b/tests/arg_enum_case_sensitive.rs index def95f26..160a1c45 100644 --- a/tests/arg_enum_case_sensitive.rs +++ b/tests/arg_enum_case_sensitive.rs @@ -1,51 +1,51 @@ -// Copyright 2018 Guillaume Pinot (@TeXitoi) , -// Kevin Knapp (@kbknapp) , and -// Andrew Hobden (@hoverbear) -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. -#[macro_use] -extern crate clap; +// // Copyright 2018 Guillaume Pinot (@TeXitoi) , +// // Kevin Knapp (@kbknapp) , and +// // Andrew Hobden (@hoverbear) +// // +// // Licensed under the Apache License, Version 2.0 or the MIT license +// // , at your +// // option. This file may not be copied, modified, or distributed +// // except according to those terms. +// #[macro_use] +// extern crate clap; -use clap::{App, Arg, ArgEnum}; +// use clap::{App, Arg, ArgEnum}; -#[derive(ArgEnum, Debug, PartialEq)] -#[case_sensitive] -enum ArgChoice { - Foo, - Bar, - Baz, -} +// #[derive(ArgEnum, Debug, PartialEq)] +// #[case_sensitive] +// enum ArgChoice { +// Foo, +// Bar, +// Baz, +// } -#[test] -fn when_lowercase() { - let matches = App::new(env!("CARGO_PKG_NAME")) - .arg( - Arg::with_name("arg") - .required(true) - .takes_value(true) - .possible_values(&ArgChoice::variants()), - ) - .get_matches_from_safe(vec!["", "foo"]); // We expect this to fail. - assert!(matches.is_err()); - assert_eq!(matches.unwrap_err().kind, clap::ErrorKind::InvalidValue); -} +// #[test] +// fn when_lowercase() { +// let matches = App::new(env!("CARGO_PKG_NAME")) +// .arg( +// Arg::with_name("arg") +// .required(true) +// .takes_value(true) +// .possible_values(&ArgChoice::variants()), +// ) +// .get_matches_from_safe(vec!["", "foo"]); // We expect this to fail. +// assert!(matches.is_err()); +// assert_eq!(matches.unwrap_err().kind, clap::ErrorKind::InvalidValue); +// } -#[test] -fn when_capitalized() { - let matches = App::new(env!("CARGO_PKG_NAME")) - .arg( - Arg::with_name("arg") - .required(true) - .takes_value(true) - .possible_values(&ArgChoice::variants()), - ) - .get_matches_from_safe(vec!["", "Foo"]) - .unwrap(); - let t = value_t!(matches.value_of("arg"), ArgChoice); - assert!(t.is_ok()); - assert_eq!(t.unwrap(), ArgChoice::Foo); -} +// #[test] +// fn when_capitalized() { +// let matches = App::new(env!("CARGO_PKG_NAME")) +// .arg( +// Arg::with_name("arg") +// .required(true) +// .takes_value(true) +// .possible_values(&ArgChoice::variants()), +// ) +// .get_matches_from_safe(vec!["", "Foo"]) +// .unwrap(); +// let t = value_t!(matches.value_of("arg"), ArgChoice); +// assert!(t.is_ok()); +// assert_eq!(t.unwrap(), ArgChoice::Foo); +// }