mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #10270 - kadiwa4:update_some_deps, r=flip1995

Browse Source 
Update dependencies `cargo_metadata` and `clap`

changelog: none

Allows removing some duplicate dependencies in rust-lang/rust's `Cargo.lock`.
This commit is contained in:
bors 2023-02-01 16:34:05 +00:00
commit 588c1ba3ff
5 changed files with 60 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -42,7 +42,7 @@ filetime = "0.2"
rustc-workspace-hack = "1.0" rustc-workspace-hack = "1.0"
# UI test dependencies # UI test dependencies
clap = { version = "3.1", features = ["derive"] } clap = { version = "4.1.4", features = ["derive"] }
clippy_utils = { path = "clippy_utils" } clippy_utils = { path = "clippy_utils" }
derive-new = "0.5" derive-new = "0.5"
if_chain = "1.0" if_chain = "1.0"

2
clippy_dev/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
aho-corasick = "0.7" aho-corasick = "0.7"
clap = "3.2" clap = "4.1.4"
indoc = "1.0" indoc = "1.0"
itertools = "0.10.1" itertools = "0.10.1"
opener = "0.5" opener = "0.5"

91
clippy_dev/src/main.rs
View File

@ -2,7 +2,7 @@
// warn on lints, that are included in `rust-lang/rust`s bootstrap // warn on lints, that are included in `rust-lang/rust`s bootstrap
#![warn(rust_2018_idioms, unused_lifetimes)] #![warn(rust_2018_idioms, unused_lifetimes)]
use clap::{Arg, ArgAction, ArgMatches, Command, PossibleValue}; use clap::{Arg, ArgAction, ArgMatches, Command};
use clippy_dev::{bless, dogfood, fmt, lint, new_lint, serve, setup, update_lints}; use clippy_dev::{bless, dogfood, fmt, lint, new_lint, serve, setup, update_lints};
use indoc::indoc; use indoc::indoc;
@ -110,24 +110,37 @@ fn get_clap_config() -> ArgMatches {
Command::new("bless").about("bless the test output changes").arg( Command::new("bless").about("bless the test output changes").arg(
Arg::new("ignore-timestamp") Arg::new("ignore-timestamp")
.long("ignore-timestamp") .long("ignore-timestamp")
.action(ArgAction::SetTrue)
.help("Include files updated before clippy was built"), .help("Include files updated before clippy was built"),
), ),
Command::new("dogfood").about("Runs the dogfood test").args([ Command::new("dogfood").about("Runs the dogfood test").args([
Arg::new("fix").long("fix").help("Apply the suggestions when possible"), Arg::new("fix")
.long("fix")
.action(ArgAction::SetTrue)
.help("Apply the suggestions when possible"),
Arg::new("allow-dirty") Arg::new("allow-dirty")
.long("allow-dirty") .long("allow-dirty")
.action(ArgAction::SetTrue)
.help("Fix code even if the working directory has changes") .help("Fix code even if the working directory has changes")
.requires("fix"), .requires("fix"),
Arg::new("allow-staged") Arg::new("allow-staged")
.long("allow-staged") .long("allow-staged")
.action(ArgAction::SetTrue)
.help("Fix code even if the working directory has staged changes") .help("Fix code even if the working directory has staged changes")
.requires("fix"), .requires("fix"),
]), ]),
Command::new("fmt") Command::new("fmt")
.about("Run rustfmt on all projects and tests") .about("Run rustfmt on all projects and tests")
.args([ .args([
Arg::new("check").long("check").help("Use the rustfmt --check option"), Arg::new("check")
Arg::new("verbose").short('v').long("verbose").help("Echo commands run"), .long("check")
.action(ArgAction::SetTrue)
.help("Use the rustfmt --check option"),
Arg::new("verbose")
.short('v')
.long("verbose")
.action(ArgAction::SetTrue)
.help("Echo commands run"),
]), ]),
Command::new("update_lints") Command::new("update_lints")
.about("Updates lint registration and information from the source code") .about("Updates lint registration and information from the source code")
@ -140,13 +153,17 @@ fn get_clap_config() -> ArgMatches {
* all lints are registered in the lint store", * all lints are registered in the lint store",
) )
.args([ .args([
Arg::new("print-only").long("print-only").help( Arg::new("print-only")
.long("print-only")
.action(ArgAction::SetTrue)
.help(
"Print a table of lints to STDOUT. \ "Print a table of lints to STDOUT. \
This does not include deprecated and internal lints. \ This does not include deprecated and internal lints. \
(Does not modify any files)", (Does not modify any files)",
), ),
Arg::new("check") Arg::new("check")
.long("check") .long("check")
.action(ArgAction::SetTrue)
.help("Checks that `cargo dev update_lints` has been run. Used on CI."), .help("Checks that `cargo dev update_lints` has been run. Used on CI."),
]), ]),
Command::new("new_lint") Command::new("new_lint")
@ -156,15 +173,13 @@ fn get_clap_config() -> ArgMatches {
.short('p') .short('p')
.long("pass") .long("pass")
.help("Specify whether the lint runs during the early or late pass") .help("Specify whether the lint runs during the early or late pass")
.takes_value(true) .value_parser(["early", "late"])
.value_parser([PossibleValue::new("early"), PossibleValue::new("late")])
.conflicts_with("type") .conflicts_with("type")
.required_unless_present("type"), .required_unless_present("type"),
Arg::new("name") Arg::new("name")
.short('n') .short('n')
.long("name") .long("name")
.help("Name of the new lint in snake case, ex: fn_too_long") .help("Name of the new lint in snake case, ex: fn_too_long")
.takes_value(true)
.required(true), .required(true),
Arg::new("category") Arg::new("category")
.short('c') .short('c')
@ -172,25 +187,23 @@ fn get_clap_config() -> ArgMatches {
.help("What category the lint belongs to") .help("What category the lint belongs to")
.default_value("nursery") .default_value("nursery")
.value_parser([ .value_parser([
PossibleValue::new("style"), "style",
PossibleValue::new("correctness"), "correctness",
PossibleValue::new("suspicious"), "suspicious",
PossibleValue::new("complexity"), "complexity",
PossibleValue::new("perf"), "perf",
PossibleValue::new("pedantic"), "pedantic",
PossibleValue::new("restriction"), "restriction",
PossibleValue::new("cargo"), "cargo",
PossibleValue::new("nursery"), "nursery",
PossibleValue::new("internal"), "internal",
PossibleValue::new("internal_warn"), "internal_warn",
]) ]),
.takes_value(true), Arg::new("type").long("type").help("What directory the lint belongs in"),
Arg::new("type") Arg::new("msrv")
.long("type") .long("msrv")
.help("What directory the lint belongs in") .action(ArgAction::SetTrue)
.takes_value(true) .help("Add MSRV config code to the lint"),
.required(false),
Arg::new("msrv").long("msrv").help("Add MSRV config code to the lint"),
]), ]),
Command::new("setup") Command::new("setup")
.about("Support for setting up your personal development environment") .about("Support for setting up your personal development environment")
@ -201,13 +214,12 @@ fn get_clap_config() -> ArgMatches {
.args([ .args([
Arg::new("remove") Arg::new("remove")
.long("remove") .long("remove")
.help("Remove the dependencies added with 'cargo dev setup intellij'") .action(ArgAction::SetTrue)
.required(false), .help("Remove the dependencies added with 'cargo dev setup intellij'"),
Arg::new("rustc-repo-path") Arg::new("rustc-repo-path")
.long("repo-path") .long("repo-path")
.short('r') .short('r')
.help("The path to a rustc repo that will be used for setting the dependencies") .help("The path to a rustc repo that will be used for setting the dependencies")
.takes_value(true)
.value_name("path") .value_name("path")
.conflicts_with("remove") .conflicts_with("remove")
.required(true), .required(true),
@ -217,26 +229,26 @@ fn get_clap_config() -> ArgMatches {
.args([ .args([
Arg::new("remove") Arg::new("remove")
.long("remove") .long("remove")
.help("Remove the pre-commit hook added with 'cargo dev setup git-hook'") .action(ArgAction::SetTrue)
.required(false), .help("Remove the pre-commit hook added with 'cargo dev setup git-hook'"),
Arg::new("force-override") Arg::new("force-override")
.long("force-override") .long("force-override")
.short('f') .short('f')
.help("Forces the override of an existing git pre-commit hook") .action(ArgAction::SetTrue)
.required(false), .help("Forces the override of an existing git pre-commit hook"),
]), ]),
Command::new("vscode-tasks") Command::new("vscode-tasks")
.about("Add several tasks to vscode for formatting, validation and testing") .about("Add several tasks to vscode for formatting, validation and testing")
.args([ .args([
Arg::new("remove") Arg::new("remove")
.long("remove") .long("remove")
.help("Remove the tasks added with 'cargo dev setup vscode-tasks'") .action(ArgAction::SetTrue)
.required(false), .help("Remove the tasks added with 'cargo dev setup vscode-tasks'"),
Arg::new("force-override") Arg::new("force-override")
.long("force-override") .long("force-override")
.short('f') .short('f')
.help("Forces the override of existing vscode tasks") .action(ArgAction::SetTrue)
.required(false), .help("Forces the override of existing vscode tasks"),
]), ]),
]), ]),
Command::new("remove") Command::new("remove")
@ -295,6 +307,7 @@ fn get_clap_config() -> ArgMatches {
.help("The new name of the lint"), .help("The new name of the lint"),
Arg::new("uplift") Arg::new("uplift")
.long("uplift") .long("uplift")
.action(ArgAction::SetTrue)
.help("This lint will be uplifted into rustc"), .help("This lint will be uplifted into rustc"),
]), ]),
Command::new("deprecate").about("Deprecates the given lint").args([ Command::new("deprecate").about("Deprecates the given lint").args([
@ -305,8 +318,6 @@ fn get_clap_config() -> ArgMatches {
Arg::new("reason") Arg::new("reason")
.long("reason") .long("reason")
.short('r') .short('r')
.required(false)
.takes_value(true)
.help("The reason for deprecation"), .help("The reason for deprecation"),
]), ]),
]) ])

2
clippy_lints/Cargo.toml
View File

@ -9,7 +9,7 @@ keywords = ["clippy", "lint", "plugin"]
edition = "2021" edition = "2021"
[dependencies] [dependencies]
cargo_metadata = "0.14" cargo_metadata = "0.15.3"
clippy_utils = { path = "../clippy_utils" } clippy_utils = { path = "../clippy_utils" }
declare_clippy_lint = { path = "../declare_clippy_lint" } declare_clippy_lint = { path = "../declare_clippy_lint" }
if_chain = "1.0" if_chain = "1.0"

4
lintcheck/Cargo.toml
View File

@ -10,8 +10,8 @@ edition = "2021"
publish = false publish = false
[dependencies] [dependencies]
cargo_metadata = "0.14" cargo_metadata = "0.15.3"
clap = "3.2" clap = "4.1.4"
crossbeam-channel = "0.5.6" crossbeam-channel = "0.5.6"
flate2 = "1.0" flate2 = "1.0"
rayon = "1.5.1" rayon = "1.5.1"