Skip to content

Commit 39a1fdd

Browse files
committed
Merge commit '3ae8faff4d46ad92f194c2a4b941c3152a701b31' into clippyup
2 parents 19579c6 + 3ae8faf commit 39a1fdd

File tree

189 files changed

+2552
-1490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+2552
-1490
lines changed

src/tools/clippy/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,6 +2493,7 @@ Released 2018-09-13
24932493
[`manual_ok_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_ok_or
24942494
[`manual_range_contains`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_range_contains
24952495
[`manual_saturating_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_saturating_arithmetic
2496+
[`manual_str_repeat`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_str_repeat
24962497
[`manual_strip`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_strip
24972498
[`manual_swap`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_swap
24982499
[`manual_unwrap_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#manual_unwrap_or
@@ -2622,6 +2623,7 @@ Released 2018-09-13
26222623
[`redundant_pub_crate`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pub_crate
26232624
[`redundant_slicing`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_slicing
26242625
[`redundant_static_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_static_lifetimes
2626+
[`ref_binding_to_reference`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_binding_to_reference
26252627
[`ref_in_deref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_in_deref
26262628
[`ref_option_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#ref_option_ref
26272629
[`regex_macro`]: https://rust-lang.github.io/rust-clippy/master/index.html#regex_macro
@@ -2670,6 +2672,7 @@ Released 2018-09-13
26702672
[`suspicious_map`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_map
26712673
[`suspicious_op_assign_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_op_assign_impl
26722674
[`suspicious_operation_groupings`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_operation_groupings
2675+
[`suspicious_splitn`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_splitn
26732676
[`suspicious_unary_op_formatting`]: https://rust-lang.github.io/rust-clippy/master/index.html#suspicious_unary_op_formatting
26742677
[`tabs_in_doc_comments`]: https://rust-lang.github.io/rust-clippy/master/index.html#tabs_in_doc_comments
26752678
[`temporary_assignment`]: https://rust-lang.github.io/rust-clippy/master/index.html#temporary_assignment

src/tools/clippy/COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2014-2020 The Rust Project Developers
1+
Copyright 2014-2021 The Rust Project Developers
22

33
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
44
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license

src/tools/clippy/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ tempfile = { version = "3.1.0", optional = true }
3333
cargo_metadata = "0.12"
3434
compiletest_rs = { version = "0.6.0", features = ["tmp"] }
3535
tester = "0.9"
36-
clippy-mini-macro-test = { version = "0.2", path = "mini-macro" }
3736
serde = { version = "1.0", features = ["derive"] }
3837
derive-new = "0.5"
3938
regex = "1.4"
4039
quote = "1"
4140
syn = { version = "1", features = ["full"] }
41+
# This is used by the `collect-metadata` alias.
42+
filetime = "0.2"
4243

4344
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
4445
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`

src/tools/clippy/LICENSE-APACHE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 2014-2020 The Rust Project Developers
189+
Copyright 2014-2021 The Rust Project Developers
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

src/tools/clippy/LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2014-2020 The Rust Project Developers
3+
Copyright (c) 2014-2021 The Rust Project Developers
44

55
Permission is hereby granted, free of charge, to any
66
person obtaining a copy of this software and associated

src/tools/clippy/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ Some lints can be configured in a TOML file named `clippy.toml` or `.clippy.toml
147147
value` mapping eg.
148148

149149
```toml
150+
avoid-breaking-exported-api = false
150151
blacklisted-names = ["toto", "tata", "titi"]
151152
cognitive-complexity-threshold = 30
152153
```
@@ -236,7 +237,7 @@ If you want to contribute to Clippy, you can find more information in [CONTRIBUT
236237

237238
## License
238239

239-
Copyright 2014-2020 The Rust Project Developers
240+
Copyright 2014-2021 The Rust Project Developers
240241

241242
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
242243
[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license

src/tools/clippy/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ fn main() {
1414
);
1515
println!(
1616
"cargo:rustc-env=RUSTC_RELEASE_CHANNEL={}",
17-
rustc_tools_util::get_channel().unwrap_or_default()
17+
rustc_tools_util::get_channel()
1818
);
1919
}

src/tools/clippy/clippy.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
avoid-breaking-exported-api = false

src/tools/clippy/clippy_lints/src/absurd_extreme_comparisons.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ use rustc_lint::{LateContext, LateLintPass};
33
use rustc_middle::ty;
44
use rustc_session::{declare_lint_pass, declare_tool_lint};
55

6-
use crate::consts::{constant, Constant};
7-
86
use clippy_utils::comparisons::{normalize_comparison, Rel};
7+
use clippy_utils::consts::{constant, Constant};
98
use clippy_utils::diagnostics::span_lint_and_help;
109
use clippy_utils::source::snippet;
1110
use clippy_utils::ty::is_isize_or_usize;

src/tools/clippy/clippy_lints/src/arithmetic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::constant_simple;
1+
use clippy_utils::consts::constant_simple;
22
use clippy_utils::diagnostics::span_lint;
33
use rustc_hir as hir;
44
use rustc_lint::{LateContext, LateLintPass};

0 commit comments

Comments
 (0)