From 272334b26aa7bed4eb11131dfd2fb75726218702 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 18 May 2022 10:08:10 -0500 Subject: [PATCH 1/3] fix: List rust-version for all crates --- clap_complete/Cargo.toml | 1 + clap_complete_fig/Cargo.toml | 1 + clap_derive/Cargo.toml | 1 + clap_lex/Cargo.toml | 1 + clap_mangen/Cargo.toml | 1 + 5 files changed, 5 insertions(+) diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index 5f47a97c0b0..16ba289c845 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "clap_complete" version = "3.1.4" +rust-version = "1.56.0" # MSRV edition = "2018" include = [ "build.rs", diff --git a/clap_complete_fig/Cargo.toml b/clap_complete_fig/Cargo.toml index 412e2d038e8..a589c63afe2 100644 --- a/clap_complete_fig/Cargo.toml +++ b/clap_complete_fig/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "clap_complete_fig" version = "3.1.5" +rust-version = "1.56.0" # MSRV edition = "2018" include = [ "src/**/*", diff --git a/clap_derive/Cargo.toml b/clap_derive/Cargo.toml index 9b25e6f85f8..442bcd00f42 100644 --- a/clap_derive/Cargo.toml +++ b/clap_derive/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "clap_derive" version = "3.1.18" +rust-version = "1.56.0" # MSRV edition = "2018" include = [ "src/**/*", diff --git a/clap_lex/Cargo.toml b/clap_lex/Cargo.toml index c2046772595..4308e188d7d 100644 --- a/clap_lex/Cargo.toml +++ b/clap_lex/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "clap_lex" version = "0.2.0" +rust-version = "1.56.0" # MSRV edition = "2018" include = [ "src/**/*", diff --git a/clap_mangen/Cargo.toml b/clap_mangen/Cargo.toml index 9bb1c8e52e8..eb2bde15dac 100644 --- a/clap_mangen/Cargo.toml +++ b/clap_mangen/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "clap_mangen" version = "0.1.6" +rust-version = "1.56.0" # MSRV edition = "2018" include = [ "src/**/*", From d827364ea98247ba38a90656dd8b412f195936d7 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 18 May 2022 10:33:37 -0500 Subject: [PATCH 2/3] style: Normalize manifests --- Cargo.toml | 30 ++++++++++++++--------------- clap_complete/Cargo.toml | 32 +++++++++++++++---------------- clap_complete_fig/Cargo.toml | 30 +++++++++++++++-------------- clap_derive/Cargo.toml | 37 +++++++++++++++++++----------------- clap_lex/Cargo.toml | 31 ++++++++++++++++-------------- clap_mangen/Cargo.toml | 35 ++++++++++++++++++---------------- 6 files changed, 103 insertions(+), 92 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 563fc681c1a..3b84f0f50ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,30 @@ [workspace] members = [ - "clap_derive", - "clap_lex", - "clap_complete", - "clap_complete_fig", - "clap_mangen", + "clap_derive", + "clap_lex", + "clap_complete", + "clap_complete_fig", + "clap_mangen", ] [package] name = "clap" version = "3.1.18" -rust-version = "1.56.0" # MSRV description = "A simple to use, efficient, and full-featured Command Line Argument Parser" repository = "https://github.com/clap-rs/clap" documentation = "https://docs.rs/clap/" categories = ["command-line-interface"] keywords = [ - "argument", - "cli", - "arg", - "parser", - "parse" + "argument", + "cli", + "arg", + "parser", + "parse" ] -edition = "2018" license = "MIT OR Apache-2.0" readme = "README.md" +edition = "2018" +rust-version = "1.56.0" # MSRV include = [ "build.rs", "src/**/*", @@ -59,9 +59,9 @@ pre-release-replacements = [ [features] default = [ - "std", - "color", - "suggestions", + "std", + "color", + "suggestions", ] debug = ["clap_derive/debug", "backtrace"] # Enables debug messages unstable-doc = ["derive", "cargo", "wrap_help", "yaml", "env", "unicode", "regex", "unstable-replace", "unstable-multicall", "unstable-grouped"] # for docs.rs diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index 16ba289c845..3a9ff20c605 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -1,8 +1,20 @@ [package] name = "clap_complete" version = "3.1.4" -rust-version = "1.56.0" # MSRV +description = "Generate shell completion scripts for your clap::Command" +repository = "https://github.com/clap-rs/clap/tree/master/clap_complete" +documentation = "https://docs.rs/clap_complete" +categories = ["command-line-interface"] +keywords = [ + "clap", + "cli", + "completion", + "bash", +] +license = "MIT OR Apache-2.0" +readme = "README.md" edition = "2018" +rust-version = "1.56.0" # MSRV include = [ "build.rs", "src/**/*", @@ -12,18 +24,9 @@ include = [ "benches/**/*", "examples/**/*" ] -description = "Generate shell completion scripts for your clap::Command" -repository = "https://github.com/clap-rs/clap/tree/master/clap_complete" -documentation = "https://docs.rs/clap_complete" -keywords = [ - "clap", - "cli", - "completion", - "bash", -] -categories = ["command-line-interface"] -license = "MIT OR Apache-2.0" -readme = "README.md" + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] [package.metadata.release] pre-release-replacements = [ @@ -62,6 +65,3 @@ required-features = ["unstable-dynamic"] default = [] unstable-dynamic = ["clap_lex", "shlex", "unicode-xid", "os_str_bytes", "clap/derive", "is_executable", "pathdiff"] debug = ["clap/debug"] - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] diff --git a/clap_complete_fig/Cargo.toml b/clap_complete_fig/Cargo.toml index a589c63afe2..a48129d473d 100644 --- a/clap_complete_fig/Cargo.toml +++ b/clap_complete_fig/Cargo.toml @@ -1,27 +1,29 @@ [package] name = "clap_complete_fig" version = "3.1.5" -rust-version = "1.56.0" # MSRV -edition = "2018" -include = [ - "src/**/*", - "Cargo.toml", - "LICENSE-*", - "README.md" -] description = "A generator library used with clap for Fig completion scripts" repository = "https://github.com/clap-rs/clap/tree/master/clap_complete_fig" documentation = "https://docs.rs/clap_complete_fig" +categories = ["command-line-interface"] keywords = [ - "clap", - "cli", - "generate", - "completion", - "fig", + "clap", + "cli", + "completion", + "fig", ] -categories = ["command-line-interface"] license = "MIT OR Apache-2.0" readme = "README.md" +edition = "2018" +rust-version = "1.56.0" # MSRV +include = [ + "build.rs", + "src/**/*", + "Cargo.toml", + "LICENSE*", + "README.md", + "benches/**/*", + "examples/**/*" +] [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/clap_derive/Cargo.toml b/clap_derive/Cargo.toml index 442bcd00f42..6082f445d10 100644 --- a/clap_derive/Cargo.toml +++ b/clap_derive/Cargo.toml @@ -1,27 +1,33 @@ [package] name = "clap_derive" version = "3.1.18" -rust-version = "1.56.0" # MSRV -edition = "2018" -include = [ - "src/**/*", - "Cargo.toml", - "LICENSE-*", - "README.md" -] description = "Parse command line argument by defining a struct, derive crate." repository = "https://github.com/clap-rs/clap/tree/master/clap_derive" documentation = "https://docs.rs/clap_derive" +categories = ["command-line-interface", "development-tools::procedural-macro-helpers"] keywords = [ - "clap", - "cli", - "parse", - "derive", - "proc_macro" + "clap", + "cli", + "parse", + "derive", + "proc_macro" ] -categories = ["command-line-interface", "development-tools::procedural-macro-helpers"] license = "MIT OR Apache-2.0" readme = "README.md" +edition = "2018" +rust-version = "1.56.0" # MSRV +include = [ + "build.rs", + "src/**/*", + "Cargo.toml", + "LICENSE*", + "README.md", + "benches/**/*", + "examples/**/*" +] + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] [package.metadata.release] shared-version = true @@ -46,6 +52,3 @@ proc-macro-error = "1" default = [] debug = [] unstable-v4 = [] - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] diff --git a/clap_lex/Cargo.toml b/clap_lex/Cargo.toml index 4308e188d7d..be2c79a40cb 100644 --- a/clap_lex/Cargo.toml +++ b/clap_lex/Cargo.toml @@ -1,27 +1,30 @@ [package] name = "clap_lex" version = "0.2.0" -rust-version = "1.56.0" # MSRV -edition = "2018" -include = [ - "src/**/*", - "Cargo.toml", - "LICENSE-*", - "README.md" -] description = "Minimal, flexible command line parser" repository = "https://github.com/clap-rs/clap/tree/master/clap_lex" documentation = "https://docs.rs/clap_lex" +categories = ["command-line-interface"] keywords = [ - "argument", - "cli", - "arg", - "parser", - "parse" + "argument", + "cli", + "arg", + "parser", + "parse" ] -categories = ["command-line-interface"] license = "MIT OR Apache-2.0" readme = "README.md" +edition = "2018" +rust-version = "1.56.0" # MSRV +include = [ + "build.rs", + "src/**/*", + "Cargo.toml", + "LICENSE*", + "README.md", + "benches/**/*", + "examples/**/*" +] [package.metadata.release] pre-release-replacements = [ diff --git a/clap_mangen/Cargo.toml b/clap_mangen/Cargo.toml index eb2bde15dac..dfc98b542a3 100644 --- a/clap_mangen/Cargo.toml +++ b/clap_mangen/Cargo.toml @@ -1,26 +1,32 @@ [package] name = "clap_mangen" version = "0.1.6" -rust-version = "1.56.0" # MSRV -edition = "2018" -include = [ - "src/**/*", - "Cargo.toml", - "LICENSE-*", - "README.md" -] description = "A manpage generator for clap" repository = "https://github.com/clap-rs/clap/tree/master/clap_mangen" documentation = "https://docs.rs/clap_mangen" +categories = ["command-line-interface"] keywords = [ - "clap", - "cli", - "generate", - "manpage", + "clap", + "cli", + "generate", + "manpage", ] -categories = ["command-line-interface"] license = "MIT OR Apache-2.0" readme = "README.md" +edition = "2018" +rust-version = "1.56.0" # MSRV +include = [ + "build.rs", + "src/**/*", + "Cargo.toml", + "LICENSE*", + "README.md", + "benches/**/*", + "examples/**/*" +] + +[package.metadata.docs.rs] +targets = ["x86_64-unknown-linux-gnu"] [package.metadata.release] pre-release-replacements = [ @@ -46,6 +52,3 @@ clap = { path = "../", version = "3.1.10", default-features = false, features = [features] default = [] debug = ["clap/debug"] - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] From 2abb6804d3bd31faabb8f44e70203e454523817a Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 18 May 2022 10:35:30 -0500 Subject: [PATCH 3/3] fix: Switch to 2021 edition --- Cargo.toml | 2 +- clap_complete/Cargo.toml | 2 +- clap_complete_fig/Cargo.toml | 2 +- clap_derive/Cargo.toml | 2 +- clap_lex/Cargo.toml | 2 +- clap_mangen/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3b84f0f50ad..74ef6dadd1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs", diff --git a/clap_complete/Cargo.toml b/clap_complete/Cargo.toml index 3a9ff20c605..9f2ad2b2955 100644 --- a/clap_complete/Cargo.toml +++ b/clap_complete/Cargo.toml @@ -13,7 +13,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs", diff --git a/clap_complete_fig/Cargo.toml b/clap_complete_fig/Cargo.toml index a48129d473d..2a3d9e691f4 100644 --- a/clap_complete_fig/Cargo.toml +++ b/clap_complete_fig/Cargo.toml @@ -13,7 +13,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs", diff --git a/clap_derive/Cargo.toml b/clap_derive/Cargo.toml index 6082f445d10..7064152163b 100644 --- a/clap_derive/Cargo.toml +++ b/clap_derive/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs", diff --git a/clap_lex/Cargo.toml b/clap_lex/Cargo.toml index be2c79a40cb..d77ef8862a4 100644 --- a/clap_lex/Cargo.toml +++ b/clap_lex/Cargo.toml @@ -14,7 +14,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs", diff --git a/clap_mangen/Cargo.toml b/clap_mangen/Cargo.toml index dfc98b542a3..825c0317fc0 100644 --- a/clap_mangen/Cargo.toml +++ b/clap_mangen/Cargo.toml @@ -13,7 +13,7 @@ keywords = [ ] license = "MIT OR Apache-2.0" readme = "README.md" -edition = "2018" +edition = "2021" rust-version = "1.56.0" # MSRV include = [ "build.rs",