Merge #17

17: Remove `#[cfg(not(test))]` feature gate on `xflags!` r=matklad a=lnicola

Closes #14

Co-authored-by: Laurențiu Nicola <[email protected]>

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xflags"
-version = "0.2.3" # NB: update me in 3 places
+version = "0.2.4" # NB: update me in 3 places
 description = "Moderately simple command line arguments parser."
 categories = ["command-line-interface"]
 license = "MIT OR Apache-2.0"
@@ -14,4 +14,4 @@ exclude = [".github/", "bors.toml", "rustfmt.toml"]
 members = ["xtask", "xflags-macros"]
 
 [dependencies]
-xflags-macros = { path = "./xflags-macros", version = "=0.2.3" }
+xflags-macros = { path = "./xflags-macros", version = "=0.2.4" }

xflags-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xflags-macros"
-version = "0.2.3"
+version = "0.2.4"
 description = "Private implementation details of xflags."
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/matklad/xflags"

xflags-macros/src/lib.rs

@@ -3,12 +3,17 @@ mod parse;
 mod emit;
 mod update;
 
-#[cfg(not(test))]
 #[proc_macro]
-pub fn xflags(ts: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let cmd = parse::parse(ts).unwrap();
-    let text = emit::emit(&cmd);
-    text.parse().unwrap()
+pub fn xflags(_ts: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    // Stub out the code, but let rust-analyzer resolve the invocation
+    #[cfg(not(test))]
+    {
+        let cmd = parse::parse(_ts).unwrap();
+        let text = emit::emit(&cmd);
+        text.parse().unwrap()
+    }
+    #[cfg(test)]
+    unimplemented!()
 }
 
 #[cfg(test)]

xflags-macros/src/parse.rs

@@ -14,6 +14,14 @@ pub(crate) struct Error {
     msg: String,
 }
 
+impl std::error::Error for Error {}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.msg)
+    }
+}
+
 pub(crate) fn parse(ts: TokenStream) -> Result<ast::XFlags> {
     let mut p = Parser::new(ts);
     xflags(&mut p)