Skip to content

Rustup #7604

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 37 commits into from
Sep 2, 2021
Merged

Rustup #7604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8e563b5
Bless clippy tests.
m-ou-se Aug 12, 2021
1ad5464
Merge commit '7bfc26ec8e7a454786668e7e52ffe527fc649735' into clippyup
flip1995 Aug 12, 2021
fd5427b
Rollup merge of #87885 - m-ou-se:edition-guide-links, r=rylev
GuillaumeGomez Aug 12, 2021
456e48f
Auto merge of #87954 - flip1995:clippyup, r=Manishearth
bors Aug 13, 2021
80bff87
move Constness into TraitPredicate
fee1-dead Jul 22, 2021
b97d4c0
Introduce hir::ExprKind::Let - Take 2
c410-f3r Aug 8, 2021
295225b
Uplift the `invalid_atomic_ordering` lint from clippy to rustc
thomcc Dec 2, 2020
d9c3f0d
Auto merge of #84039 - jyn514:uplift-atomic-ordering, r=wesleywiser
bors Aug 16, 2021
d5e51db
clippy: Fix format_args expansion parsing
camsteffen Jul 16, 2021
4123fed
remove box_syntax uses from cranelift and tools
hellow554 Aug 6, 2021
ae02282
Fix clippy let expressions fallout
camsteffen Aug 19, 2021
5fec618
introduce a Coerce predicate
nikomatsakis Nov 21, 2020
cd4bf7f
cleanup: `Span::new` -> `Span::with_lo`
petrochenkov Aug 21, 2021
e5fe462
Auto merge of #88163 - camsteffen:collapsible-match-fix, r=Manishearth
bors Aug 22, 2021
c860718
Fix typos “a”→“an”
steffahn Aug 22, 2021
21da42c
Fix more “a”/“an” typos
steffahn Aug 22, 2021
8b6529e
Fix typos “an”→“a” and a few different ones that appeared in the same…
steffahn Aug 22, 2021
5868e28
Rollup merge of #88211 - petrochenkov:withhilo, r=jyn514
GuillaumeGomez Aug 22, 2021
4c847c0
Rollup merge of #88230 - steffahn:a_an, r=oli-obk
m-ou-se Aug 23, 2021
72df99a
Auto merge of #83302 - camsteffen:write-piece-unchecked, r=dtolnay
bors Aug 23, 2021
4d627fc
require a `tcx` for `TypeVisitor`
lcnr Mar 13, 2021
19d1fe2
make unevaluated const substs optional
lcnr Mar 15, 2021
b1786f6
add `tcx` to `fn walk`
lcnr Jul 17, 2021
afd892a
update `TypeFlags` to deal with missing ct substs
lcnr Jul 17, 2021
8c4056f
Treat macros as HIR items
inquisitivecrystal Jul 31, 2021
c8262ad
Teach tools that macros are now HIR items
inquisitivecrystal Aug 5, 2021
0b526fd
rename const_evaluatable_checked to generic_const_exprs
BoxyUwU Aug 25, 2021
fd8b150
`feature(const_generics)` -> `feature(const_param_types)`
lcnr Aug 27, 2021
78bf4ac
Fix clippy for let-else
camsteffen Jul 25, 2021
61bb967
Merge remote-tracking branch 'upstream/master' into rustup2
flip1995 Sep 2, 2021
5722a7d
Fix manual_match with let-expressions
camsteffen Aug 26, 2021
588367b
Fix dogfood
camsteffen Aug 26, 2021
c7c2036
Fix remaining dogfood errors
flip1995 Aug 26, 2021
c2bb313
Add higher docs and remove some unneeded fields
camsteffen Aug 27, 2021
8bf2940
Fix matadata collection configuration formatting
xFrednet Aug 28, 2021
fb6839d
Bump nightly version -> 2021-09-02
flip1995 Sep 2, 2021
01b17af
Fix fallout from re-applying patches
flip1995 Sep 2, 2021
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
5 changes: 2 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ Released 2020-11-19
[#5907](https://git.1-hub.cnrust-lang/rust-clippy/pull/5907)
* [`suspicious_arithmetic_impl`]: extend to implementations of `BitAnd`, `BitOr`, `BitXor`, `Rem`, `Shl`, and `Shr`
[#5884](https://git.1-hub.cnrust-lang/rust-clippy/pull/5884)
* [`invalid_atomic_ordering`]: detect misuse of `compare_exchange`, `compare_exchange_weak`, and `fetch_update`
* `invalid_atomic_ordering`: detect misuse of `compare_exchange`, `compare_exchange_weak`, and `fetch_update`
[#6025](https://git.1-hub.cnrust-lang/rust-clippy/pull/6025)
* Avoid [`redundant_pattern_matching`] triggering in macros
[#6069](https://git.1-hub.cnrust-lang/rust-clippy/pull/6069)
Expand Down Expand Up @@ -1451,7 +1451,7 @@ Released 2020-03-12
* [`option_as_ref_deref`] [#4945](https://git.1-hub.cnrust-lang/rust-clippy/pull/4945)
* [`wildcard_in_or_patterns`] [#4960](https://git.1-hub.cnrust-lang/rust-clippy/pull/4960)
* [`iter_nth_zero`] [#4966](https://git.1-hub.cnrust-lang/rust-clippy/pull/4966)
* [`invalid_atomic_ordering`] [#4999](https://git.1-hub.cnrust-lang/rust-clippy/pull/4999)
* `invalid_atomic_ordering` [#4999](https://git.1-hub.cnrust-lang/rust-clippy/pull/4999)
* [`skip_while_next`] [#5067](https://git.1-hub.cnrust-lang/rust-clippy/pull/5067)

### Moves and Deprecations
Expand Down Expand Up @@ -2712,7 +2712,6 @@ Released 2018-09-13
[`integer_arithmetic`]: https://rust-lang.github.io/rust-clippy/master/index.html#integer_arithmetic
[`integer_division`]: https://rust-lang.github.io/rust-clippy/master/index.html#integer_division
[`into_iter_on_ref`]: https://rust-lang.github.io/rust-clippy/master/index.html#into_iter_on_ref
[`invalid_atomic_ordering`]: https://rust-lang.github.io/rust-clippy/master/index.html#invalid_atomic_ordering
[`invalid_null_ptr_usage`]: https://rust-lang.github.io/rust-clippy/master/index.html#invalid_null_ptr_usage
[`invalid_regex`]: https://rust-lang.github.io/rust-clippy/master/index.html#invalid_regex
[`invalid_upcast_comparisons`]: https://rust-lang.github.io/rust-clippy/master/index.html#invalid_upcast_comparisons
Expand Down
3 changes: 2 additions & 1 deletion clippy_lints/src/assertions_on_constants.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use clippy_utils::consts::{constant, Constant};
use clippy_utils::diagnostics::span_lint_and_help;
use clippy_utils::higher;
use clippy_utils::source::snippet_opt;
use clippy_utils::{is_direct_expn_of, is_expn_of, match_panic_call};
use if_chain::if_chain;
Expand Down Expand Up @@ -116,7 +117,7 @@ enum AssertKind {
/// where `message` is any expression and `c` is a constant bool.
fn match_assert_with_message<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<AssertKind> {
if_chain! {
if let ExprKind::If(cond, then, _) = expr.kind;
if let Some(higher::If { cond, then, .. }) = higher::If::hir(expr);
if let ExprKind::Unary(UnOp::Not, expr) = cond.kind;
// bind the first argument of the `assert!` macro
if let Some((Constant::Bool(is_true), _)) = constant(cx, cx.typeck_results(), expr);
Expand Down
230 changes: 0 additions & 230 deletions clippy_lints/src/atomic_ordering.rs

This file was deleted.

3 changes: 2 additions & 1 deletion clippy_lints/src/blocks_in_if_conditions.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clippy_utils::diagnostics::{span_lint, span_lint_and_sugg};
use clippy_utils::higher;
use clippy_utils::source::snippet_block_with_applicability;
use clippy_utils::ty::implements_trait;
use clippy_utils::{differing_macro_contexts, get_parent_expr};
Expand Down Expand Up @@ -92,7 +93,7 @@ impl<'tcx> LateLintPass<'tcx> for BlocksInIfConditions {
if in_external_macro(cx.sess(), expr.span) {
return;
}
if let ExprKind::If(cond, _, _) = &expr.kind {
if let Some(higher::If { cond, .. }) = higher::If::hir(expr) {
if let ExprKind::Block(block, _) = &cond.kind {
if block.rules == BlockCheckMode::DefaultBlock {
if block.stmts.is_empty() {
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/booleans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<'a, 'tcx, 'v> Hir2Qmm<'a, 'tcx, 'v> {
// prevent folding of `cfg!` macros and the like
if !e.span.from_expansion() {
match &e.kind {
ExprKind::Unary(UnOp::Not, inner) => return Ok(Bool::Not(box self.run(inner)?)),
ExprKind::Unary(UnOp::Not, inner) => return Ok(Bool::Not(Box::new(self.run(inner)?))),
ExprKind::Binary(binop, lhs, rhs) => match &binop.node {
BinOpKind::Or => {
return Ok(Bool::Or(self.extract(BinOpKind::Or, &[lhs, rhs], Vec::new())?));
Expand Down
Loading