test: Get 'cargo test' working with clap v3

Cargo.toml

@@ -28,7 +28,7 @@ proc-macro2 = "0.4"
 clippy = {version = "0.0.174", optional = true }
 
 [dev-dependencies]
-clap = { git = "https://github.com/clap-rs/clap", branch = "v3-master"} # ONLY FOR INITIAL DEVELOPMENT...change to real crates.io ver for rlease!
+clap = { git = "https://github.com/clap-rs/clap", branch = "master"} # ONLY FOR INITIAL DEVELOPMENT...change to real crates.io ver for rlease!
 
 [features]
 default = []

examples/no_version.rs

@@ -9,7 +9,7 @@ use clap::{AppSettings, Clap};
     about = "",
     version = "",
     author = "",
-    raw(global_settings = "&[AppSettings::DisableVersion]")
+    raw(global_setting = "AppSettings::DisableVersion")
 )]
 struct Opt {}
 

examples/raw_attributes.rs

@@ -19,7 +19,8 @@ use clap::{AppSettings, Clap};
 
 /// An example of raw attributes
 #[derive(Clap, Debug)]
-#[clap(raw(global_settings = "&[AppSettings::ColoredHelp, AppSettings::VersionlessSubcommands]"))]
+#[clap(raw(global_setting = "AppSettings::ColoredHelp"))]
+#[clap(raw(global_setting = "AppSettings::VersionlessSubcommands"))]
 struct Opt {
     /// Output file
     #[clap(short = "o", long = "output")]

tests/author_version_about.rs

@@ -45,6 +45,7 @@ FLAGS:
 
     -V, --version    
             Prints version information
+
 ";
 
 #[test]

tests/raw_attributes.rs

@@ -19,7 +19,7 @@ use clap::{AppSettings, Clap};
 
 // Check if the global settings compile
 #[derive(Clap, Debug, PartialEq, Eq)]
-#[clap(raw(global_settings = "&[AppSettings::ColoredHelp]"))]
+#[clap(raw(global_setting = "AppSettings::ColoredHelp"))]
 struct Opt {
     #[clap(
         long = "x",
@@ -32,11 +32,7 @@ struct Opt {
     )]
     x: i32,
 
-    #[clap(
-        short = "l",
-        long = "level",
-        raw(aliases = r#"&["set-level", "lvl"]"#)
-    )]
+    #[clap(short = "l", long = "level", raw(aliases = r#"&["set-level", "lvl"]"#))]
     level: String,
 
     #[clap(long = "values")]