Emit error about raw removal

Author: CreepySkeleton

structopt-derive/src/attrs.rs

@@ -244,7 +244,7 @@ impl Attrs {
 
  MethodCall(name, args) => self.methods.push(Method {
  name: name.into(),
- args: quote!(#args),
+ args: quote!(#(#args),*),
  }),
 
  RenameAll(_, casing_lit) => {

structopt-derive/src/parse.rs

@@ -121,9 +121,22 @@ impl Parse for StructOptAttr {
  }
  }
 
+ "raw" => {
+ match nested.parse::<LitBool>() {
+ Ok(bool_token) => {
+ let expr = ExprLit { attrs: vec![], lit: Lit::Bool(bool_token) };
+ let expr = Expr::Lit(expr);
+ Ok(MethodCall(name, vec![expr]))
+ }
+
+ Err(_) => span_error!(name.span(),
+ "`#[structopt(raw(...))` attributes are deprecated in structopt 3.0, only `raw(true)` and `raw(false)` are allowed")
+ }
+ }
+
  _ => {
- let method_args = nested.parse_terminated(Expr::parse)?;
- Ok(MethodCall(name, method_args))
+ let method_args: Punctuated<_, Token![,]> = nested.parse_terminated(Expr::parse)?;
+ Ok(MethodCall(name, Vec::from_iter(method_args)))
  }
  }
  } else {

tests/raw_bool_literal.rs

@@ -0,0 +1,30 @@
+// Copyright 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use structopt::clap;
+use structopt::StructOpt;
+
+#[test]
+fn raw_bool_literal() {
+ #[derive(StructOpt, Debug, PartialEq)]
+ #[structopt(no_version, name = "raw_bool")]
+ struct Opt {
+ #[structopt(raw(false))]
+ a: String,
+ #[structopt(raw(true))]
+ b: String,
+ }
+
+ assert_eq!(
+ Opt {
+ a: "one".into(),
+ b: "--help".into()
+ },
+ Opt::from_iter(&["test", "one", "--", "--help"])
+ );
+}

tests/ui/raw.rs

@@ -0,0 +1,17 @@
+// Copyright 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use structopt::StructOpt;
+
+#[derive(StructOpt, Debug)]
+struct Opt {
+ #[structopt(raw(case_insensitive = "true"))]
+ s: String,
+}
+
+fn main() {}

tests/ui/raw.stderr

@@ -0,0 +1,5 @@
+error: `#[structopt(raw(...))` attributes are deprecated in structopt 3.0, only `raw(true)` and `raw(false)` are allowed
+ --> $DIR/raw.rs:13:17
+ |
+13 | #[structopt(raw(case_insensitive = "true"))]
+ | ^^^