Skip to content

Clippy subtree sync #116489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 83 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
1c77b0b
Move needless_raw_string_hashes to pedantic
Alexendoo Aug 27, 2023
b5941a2
Partially outline code inside the panic! macro
Zoxc Sep 3, 2023
39f7f69
Add msrv test template for `cargo dev new_lint --msrv`
Alexendoo Sep 23, 2023
772296c
Merge commit '7671c283a50b5d1168841f3014b14000f01dd204' into clippyup
flip1995 Sep 25, 2023
6ad218c
Add colored help
blyxyas Sep 13, 2023
78ddc8d
Auto merge of #11495 - blyxyas:help_message_reformat, r=flip1995
bors Sep 25, 2023
1972cc8
Test that each config value exists in a test clippy.toml
Alexendoo Sep 25, 2023
84d6894
it's not Miri but MIR constants
RalfJung Sep 25, 2023
ce45221
simply some valtree-to-const conversion
RalfJung Sep 25, 2023
0f19857
mir_to_const: fix handling of float arrays
RalfJung Sep 25, 2023
6c48ef3
Auto merge of #11557 - Alexendoo:dev-new-lint-msrv-test, r=Manishearth
bors Sep 25, 2023
bf4c998
Auto merge of #11564 - Alexendoo:config-test-test, r=giraffate
bors Sep 26, 2023
5507482
Don't store lazyness in DefKind
compiler-errors Sep 26, 2023
fab9000
Do not lint when imported item contains underscore
koka831 Feb 6, 2023
f2efdba
subst -> instantiate
lcnr Sep 25, 2023
585b56f
Auto merge of #10300 - koka831:fix/9942, r=xFrednet
bors Sep 26, 2023
6cdff10
Describe the type of string in raw_strings lints
Alexendoo Sep 26, 2023
ec2f626
Add `manual_hash_one` lint
Alexendoo Sep 23, 2023
493ab53
Auto merge of #11556 - Alexendoo:manual-hash-one, r=Manishearth
bors Sep 26, 2023
4494b69
Auto merge of #11569 - Alexendoo:needless-raw-string-descr, r=llogiq
bors Sep 26, 2023
7f132e8
Auto merge of #116144 - lcnr:subst-less, r=oli-obk
bors Sep 26, 2023
3b75db7
Auto merge of #116163 - compiler-errors:lazyness, r=oli-obk
bors Sep 27, 2023
62b8ef3
Mention that `missing_assert_message` lint ignores test functions
unexge Sep 27, 2023
124f1b0
Auto merge of #11574 - unexge:missing-assert-message-docs, r=Alexendoo
bors Sep 28, 2023
b413bf6
Fix index of the remaining positional arguments
koka831 Sep 28, 2023
29ed6fa
Auto merge of #11415 - Alexendoo:needless-raw-string-hashes-pedantic,…
bors Sep 28, 2023
d18d01a
Auto merge of #11576 - koka831:fix/10128, r=llogiq
bors Sep 28, 2023
91997a4
Auto merge of #11565 - RalfJung:mir_to_const, r=Jarcho
bors Sep 28, 2023
82207f4
Move needless_raw_string_hashes to pedantic
Alexendoo Aug 27, 2023
330ebbb
new lint: `iter_without_into_iter`
y21 Sep 17, 2023
38fd80a
Remove `rustc_lint_defs::lint_array`
DaniPopes Sep 28, 2023
a4d11d9
Reverse postorder instead of using reversed postorder
WaffleLapkin Sep 28, 2023
ad5653b
Add missing lint description headers
DaniPopes Sep 29, 2023
d38fa1a
Auto merge of #11527 - y21:iter_without_into_iter, r=Jarcho
bors Sep 29, 2023
1a82ca0
Rollup merge of #116245 - flip1995:clippy-backport, r=Manishearth
matthiaskrgr Sep 29, 2023
67a83ff
Auto merge of #11582 - DaniPopes:missing-headers, r=xFrednet
bors Sep 29, 2023
2d20179
[`manual_let_else`]: only omit block if span is from same ctxt
y21 Sep 28, 2023
b00236d
Auto merge of #11580 - y21:issue11579, r=Jarcho
bors Sep 29, 2023
ad0b7ed
Auto merge of #116254 - WaffleLapkin:nicen-traversal, r=cjgillot
bors Sep 30, 2023
44b6aca
Avoid linting in external/proc macro
koka831 Sep 30, 2023
d5cc97e
Add macro for test which use std internally
koka831 Sep 30, 2023
8eb586d
new lint: `into_iter_without_iter`
y21 Sep 30, 2023
0e43a04
Auto merge of #11587 - y21:into_iter_without_iter, r=Jarcho
bors Sep 30, 2023
e683e3e
Don't lint `manual_non_exhaustive` when enum explicitly marked as `no…
Tyrubias Oct 1, 2023
3169423
Auto merge of #115670 - Zoxc:outline-panic-macro-1, r=Mark-Simulacrum
bors Oct 1, 2023
9dfd60c
Remove extraneous `#[non_exhaustive]` check in lint
Tyrubias Oct 1, 2023
6f1a78f
Use Span#from_expansion instead of in_external_macro
koka831 Oct 1, 2023
0f8b862
Fix documentation link
schubart Oct 1, 2023
cbe67bc
Auto merge of #11590 - Tyrubias:non_ex_false_positive, r=Alexendoo
bors Oct 1, 2023
ec15630
Auto merge of #11592 - schubart:fix_documentation_link, r=flip1995
bors Oct 1, 2023
aee3daf
Auto merge of #11593 - koka831:fix/10511, r=xFrednet
bors Oct 1, 2023
258b9a8
Don't escape unicode escape braces in print_literal
Alexendoo Jul 31, 2023
331d01e
Auto merge of #11265 - Alexendoo:print-literal-unicode-escapes, r=llogiq
bors Oct 1, 2023
3f0da4d
Move `needless_pass_by_ref_mut`: `suspicious` -> `nursery`
blyxyas Oct 2, 2023
07e6329
Modify tests to account for the new allow-by-default `needless_pass_b…
blyxyas Oct 2, 2023
08c429f
Auto merge of #11596 - blyxyas:fix-fp-needless_pass_by_ref_mut, r=Jarcho
bors Oct 2, 2023
ea4b388
subtyping_projections
ouz-a Aug 16, 2023
81400e2
Auto merge of #11589 - koka831:fix/10198, r=giraffate
bors Oct 3, 2023
2c525fd
Point to full async fn for future
compiler-errors Oct 2, 2023
f107a50
Auto merge of #115025 - ouz-a:ouz_testing, r=lcnr
bors Oct 3, 2023
e465264
Avoid invoking `ignored_unit_patterns` in macro definition
koka831 Oct 3, 2023
1a56f90
Fix: avoid changing drop order
koka831 Oct 3, 2023
29958f0
Auto merge of #11602 - koka831:fix/11601, r=xFrednet
bors Oct 3, 2023
c715267
Apply review suggestions from @y21
koka831 Oct 3, 2023
b437069
Auto merge of #11603 - koka831:fix/11599, r=y21
bors Oct 3, 2023
eab0a75
Update version attribute for 1.73 lints
xFrednet Oct 3, 2023
8d920a8
Changelog for Rust 1.73 :pen:
xFrednet Oct 3, 2023
9483555
sudo CI=green
xFrednet Oct 3, 2023
404217e
Address PR Review <3
xFrednet Oct 4, 2023
716f211
Auto merge of #116360 - compiler-errors:async-span, r=oli-obk
bors Oct 4, 2023
9554e47
Auto merge of #11605 - xFrednet:changelog-1-73, r=blyxyas
bors Oct 4, 2023
56794fa
Fix clippy
compiler-errors Oct 2, 2023
c5c6d70
Point to closure return instead of output if defaulted
compiler-errors Oct 2, 2023
dcc4001
Fix `items_after_test_module` for non root modules, add applicable su…
Alexendoo Oct 4, 2023
48d2770
Improve `redundant_locals` help message
koka831 Oct 6, 2023
279127c
Auto merge of #11611 - Alexendoo:items-after-test-module-check-crate,…
bors Oct 6, 2023
7217c0f
Auto merge of #11628 - koka831:fix/11625, r=blyxyas
bors Oct 6, 2023
82c3064
Merge remote-tracking branch 'upstream/master' into rustup
flip1995 Oct 6, 2023
50754da
Bump nightly version -> 2023-10-06
flip1995 Oct 6, 2023
b8677e5
Bump Clippy version -> 0.1.75
flip1995 Oct 6, 2023
b105fb4
Auto merge of #11629 - flip1995:rustup, r=flip1995
bors Oct 6, 2023
3c8c3ad
Merge commit 'b105fb4c39bc1a010807a6c076193cef8d93c109' into clippyup
flip1995 Oct 6, 2023
6233d44
Update Cargo.lock
flip1995 Oct 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add colored help
  • Loading branch information
blyxyas committed Sep 25, 2023
commit 6ad218ceef976d67af4bd065732b1f37595c882c
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ clippy_lints = { path = "clippy_lints" }
rustc_tools_util = "0.3.0"
tempfile = { version = "3.2", optional = true }
termize = "0.1"
color-print = "0.3.4" # Sync version with Cargo
anstream = "0.5.0"

[dev-dependencies]
ui_test = "0.20"
Expand Down
55 changes: 28 additions & 27 deletions src/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ use std::ops::Deref;
use std::path::Path;
use std::process::exit;

use anstream::println;

/// If a command-line option matches `find_arg`, then apply the predicate `pred` on its value. If
/// true, then return it. The parameter is assumed to be either `--arg=value` or `--arg value`.
fn arg_value<'a, T: Deref<Target = str>>(
Expand Down Expand Up @@ -162,39 +164,15 @@ impl rustc_driver::Callbacks for ClippyCallbacks {
}
}

#[allow(clippy::ignored_unit_patterns)]
fn display_help() {
println!(
"\
Checks a package to catch common mistakes and improve your Rust code.

Usage:
cargo clippy [options] [--] [<opts>...]

Common options:
-h, --help Print this message
--rustc Pass all args to rustc
-V, --version Print version info and exit

For the other options see `cargo check --help`.

To allow or deny a lint from the command line you can use `cargo clippy --`
with:

-W --warn OPT Set lint warnings
-A --allow OPT Set lint allowed
-D --deny OPT Set lint denied
-F --forbid OPT Set lint forbidden

You can use tool lints to allow or deny lints from your code, eg.:

#[allow(clippy::needless_lifetimes)]
"
);
println!("{}", help_message());
}

const BUG_REPORT_URL: &str = "https://github.com/rust-lang/rust-clippy/issues/new?template=ice.yml";

#[allow(clippy::too_many_lines)]
#[allow(clippy::ignored_unit_patterns)]
pub fn main() {
let handler = EarlyErrorHandler::new(ErrorOutputType::default());

Expand Down Expand Up @@ -236,6 +214,7 @@ pub fn main() {

if orig_args.iter().any(|a| a == "--version" || a == "-V") {
let version_info = rustc_tools_util::get_version_info!();

println!("{version_info}");
exit(0);
}
Expand Down Expand Up @@ -292,3 +271,25 @@ pub fn main() {
}
}))
}

#[must_use]
fn help_message() -> &'static str {
color_print::cstr!(
"Checks a file to catch common mistakes and improve your Rust code.
Run <cyan>clippy-driver</> with the same arguments you use for <cyan>rustc</>

<green,bold>Usage</>:
<cyan,bold>clippy-driver</> <cyan>[OPTIONS] INPUT</>

<green,bold>Common options:</>
<cyan,bold>-h</>, <cyan,bold>--help</> Print this message
<cyan,bold>-V</>, <cyan,bold>--version</> Print version info and exit
<cyan,bold>--rustc</> Pass all arguments to <cyan>rustc</>

<green,bold>Allowing / Denying lints</>
You can use tool lints to allow or deny lints from your code, e.g.:

<yellow,bold>#[allow(clippy::needless_lifetimes)]</>
"
)
}
63 changes: 36 additions & 27 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,14 @@ use std::env;
use std::path::PathBuf;
use std::process::{self, Command};

const CARGO_CLIPPY_HELP: &str = "Checks a package to catch common mistakes and improve your Rust code.

Usage:
cargo clippy [options] [--] [<opts>...]

Common options:
--no-deps Run Clippy only on the given crate, without linting the dependencies
--fix Automatically apply lint suggestions. This flag implies `--no-deps` and `--all-targets`
-h, --help Print this message
-V, --version Print version info and exit
--explain LINT Print the documentation for a given lint

For the other options see `cargo check --help`.

To allow or deny a lint from the command line you can use `cargo clippy --`
with:

-W --warn OPT Set lint warnings
-A --allow OPT Set lint allowed
-D --deny OPT Set lint denied
-F --forbid OPT Set lint forbidden

You can use tool lints to allow or deny lints from your code, e.g.:

#[allow(clippy::needless_lifetimes)]
";
use anstream::println;

#[allow(clippy::ignored_unit_patterns)]
fn show_help() {
println!("{CARGO_CLIPPY_HELP}");
println!("{}", help_message());
}

#[allow(clippy::ignored_unit_patterns)]
fn show_version() {
let version_info = rustc_tools_util::get_version_info!();
println!("{version_info}");
Expand Down Expand Up @@ -168,6 +145,38 @@ where
}
}

#[must_use]
pub fn help_message() -> &'static str {
color_print::cstr!(
"Checks a package to catch common mistakes and improve your Rust code.

<green,bold>Usage</>:
<cyan,bold>cargo clippy</> <cyan>[OPTIONS] [--] [<<ARGS>>...]</>

<green,bold>Common options:</>
<cyan,bold>--no-deps</> Run Clippy only on the given crate, without linting the dependencies
<cyan,bold>--fix</> Automatically apply lint suggestions. This flag implies <cyan>--no-deps</> and <cyan>--all-targets</>
<cyan,bold>-h</>, <cyan,bold>--help</> Print this message
<cyan,bold>-V</>, <cyan,bold>--version</> Print version info and exit
<cyan,bold>--explain [LINT]</> Print the documentation for a given lint

See all options with <cyan,bold>cargo check --help</>.

<green,bold>Allowing / Denying lints</>

To allow or deny a lint from the command line you can use <cyan,bold>cargo clippy --</> with:

<cyan,bold>-W</> / <cyan,bold>--warn</> <cyan>[LINT]</> Set lint warnings
<cyan,bold>-A</> / <cyan,bold>--allow</> <cyan>[LINT]</> Set lint allowed
<cyan,bold>-D</> / <cyan,bold>--deny</> <cyan>[LINT]</> Set lint denied
<cyan,bold>-F</> / <cyan,bold>--forbid</> <cyan>[LINT]</> Set lint forbidden

You can use tool lints to allow or deny lints from your code, e.g.:

<yellow,bold>#[allow(clippy::needless_lifetimes)]</>
"
)
}
#[cfg(test)]
mod tests {
use super::ClippyCmd;
Expand Down