diff --git a/examples/01a_quick_example.rs b/examples/01a_quick_example.rs index 300f5224791..7ce3942660f 100644 --- a/examples/01a_quick_example.rs +++ b/examples/01a_quick_example.rs @@ -33,7 +33,6 @@ fn main() { .version("1.0") .author("Kevin K. ") .about("Does awesome things") - .license("MIT OR Apache-2.0") .arg("-c, --config=[FILE] 'Sets a custom config file'") .arg(" 'Sets an optional output file'") .arg("-d..., --debug... 'Turn debugging information on'") diff --git a/examples/01b_quick_example.rs b/examples/01b_quick_example.rs index 8b3a42891a1..1e6c3c46152 100644 --- a/examples/01b_quick_example.rs +++ b/examples/01b_quick_example.rs @@ -35,7 +35,6 @@ fn main() { .version("1.0") .author("Kevin K. ") .about("Does awesome things") - .license("MIT OR Apache-2.0") .arg( Arg::new("config") .short('c') diff --git a/examples/02_apps.rs b/examples/02_apps.rs index 206b5ebfd6c..03555317b32 100644 --- a/examples/02_apps.rs +++ b/examples/02_apps.rs @@ -20,7 +20,6 @@ fn main() { .version("1.0") .author("Kevin K. ") .about("Does awesome things") - .license("MIT OR Apache-2.0") .get_matches(); // This example doesn't do much, but it *does* give automatic -h, --help, -V, and --version functionality ;) diff --git a/examples/04_using_matches.rs b/examples/04_using_matches.rs index 59623aaf438..806f7b51659 100644 --- a/examples/04_using_matches.rs +++ b/examples/04_using_matches.rs @@ -16,7 +16,6 @@ fn main() { // argument. let matches = App::new("MyApp") .about("Parses an input file to do awesome things") - .license("MIT OR Apache-2.0") .version("1.0") .author("Kevin K. ") .arg( diff --git a/examples/08_subcommands.rs b/examples/08_subcommands.rs index a7cd0d60547..2b7c1ce14f6 100644 --- a/examples/08_subcommands.rs +++ b/examples/08_subcommands.rs @@ -24,7 +24,6 @@ fn main() { App::new("add") // The name we call argument with .about("Adds files to myapp") // The message displayed in "myapp -h" // or "myapp help" - .license("MIT OR Apache-2.0") .version("0.1") // Subcommands can have independent version .author("Kevin K.") // And authors .arg( diff --git a/examples/20_subcommands.rs b/examples/20_subcommands.rs index 6f38e129022..2fa126faa0d 100644 --- a/examples/20_subcommands.rs +++ b/examples/20_subcommands.rs @@ -49,7 +49,6 @@ fn main() { .subcommand( App::new("clone") .about("clones repos") - .license("MIT OR Apache-2.0") .arg(Arg::new("repo").about("The repo to clone").required(true)), ) .subcommand( diff --git a/examples/21_aliases.rs b/examples/21_aliases.rs index e0442339eb3..50c65e579f9 100644 --- a/examples/21_aliases.rs +++ b/examples/21_aliases.rs @@ -6,7 +6,6 @@ fn main() { App::new("ls") .aliases(&["list", "dir"]) .about("Adds files to myapp") - .license("MIT OR Apache-2.0") .version("0.1") .author("Kevin K.") .arg( diff --git a/src/build/app/mod.rs b/src/build/app/mod.rs index 44ac39534b5..86ff8aeac8c 100644 --- a/src/build/app/mod.rs +++ b/src/build/app/mod.rs @@ -71,7 +71,6 @@ pub struct App<'help> { pub(crate) author: Option<&'help str>, pub(crate) version: Option<&'help str>, pub(crate) long_version: Option<&'help str>, - pub(crate) license: Option<&'help str>, pub(crate) about: Option<&'help str>, pub(crate) long_about: Option<&'help str>, pub(crate) before_help: Option<&'help str>, @@ -747,27 +746,6 @@ impl<'help> App<'help> { self } - /// Sets a string of the license to be displayed when displaying help information. - /// - /// **Pro-tip:** Use `clap`s convenience macro [`crate_license!`] to automatically set your - /// application's license to the same thing as your crate at compile time. See the - /// [`examples/`] directory for more information - /// - /// # Examples - /// - /// ```no_run - /// # use clap::{App, Arg}; - /// App::new("myprog") - /// .license("MIT OR Apache-2.0") - /// # ; - /// ``` - /// [`crate_license!`]: ./macro.crate_license!.html - /// [`examples/`]: https://github.com/clap-rs/clap/tree/master/examples - pub fn license>(mut self, license: S) -> Self { - self.license = Some(license.into()); - self - } - /// Overrides the `clap` generated usage string. /// /// This will be displayed to the user when errors are found in argument parsing. diff --git a/src/macros.rs b/src/macros.rs index 5dedc0c24b1..b57c2c1a7ad 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -32,37 +32,6 @@ macro_rules! load_yaml { }; } -/// Allows you to pull the licence from your Cargo.toml at compile time. If the `license` field is -/// empty, then the `licence-field` is read. If both fields are empty, then an empty string is -/// returned. -/// -/// # Examples -/// -/// ```no_run -/// # #[macro_use] -/// # extern crate clap; -/// # use clap::App; -/// # fn main() { -/// let m = App::new("app") -/// .license(crate_license!()) -/// .get_matches(); -/// # } -/// ``` -#[cfg(feature = "cargo")] -#[macro_export] -macro_rules! crate_license { - () => {{ - let mut license = env!("CARGO_PKG_LICENSE"); - if license.is_empty() { - license = env!("CARGO_PKG_LICENSE_FILE"); - } - if license.is_empty() { - license = ""; - } - license - }}; -} - /// Allows you to pull the version from your Cargo.toml at compile time as /// `MAJOR.MINOR.PATCH_PKGVERSION_PRE` /// @@ -197,14 +166,12 @@ macro_rules! app_from_crate { .version($crate::crate_version!()) .author($crate::crate_authors!()) .about($crate::crate_description!()) - .license($crate::crate_license!()) }; ($sep:expr) => { $crate::App::new($crate::crate_name!()) .version($crate::crate_version!()) .author($crate::crate_authors!($sep)) .about($crate::crate_description!()) - .license($crate::crate_license!()) }; }