Skip to content

Commit e8642c7

Browse files
borsbors
committed
Auto merge of #5003 - JohnTitor:rustup, r=flip1995
Rustup to rust-lang/rust#67886 changelog: none
2 parents 390eacf + 65d1534 commit e8642c7

File tree

140 files changed

+229
-218
lines changed

Some content is hidden

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

140 files changed

+229
-218
lines changed

‎clippy_lints/src/approx_const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::utils::span_lint;
22
use rustc::declare_lint_pass;
3-
use rustc::hir::*;
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4+
use rustc_hir::*;
55
use rustc_session::declare_tool_lint;
66
use rustc_span::symbol;
77
use std::f64::consts as f64;

‎clippy_lints/src/arithmetic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::consts::constant_simple;
22
use crate::utils::span_lint;
3-
use rustc::hir;
43
use rustc::impl_lint_pass;
54
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
5+
use rustc_hir as hir;
66
use rustc_session::declare_tool_lint;
77
use rustc_span::source_map::Span;
88

‎clippy_lints/src/assertions_on_constants.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use crate::utils::paths;
33
use crate::utils::{is_direct_expn_of, is_expn_of, match_function_call, snippet_opt, span_help_and_lint};
44
use if_chain::if_chain;
55
use rustc::declare_lint_pass;
6-
use rustc::hir::*;
76
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
7+
use rustc_hir::*;
88
use rustc_session::declare_tool_lint;
99
use syntax::ast::LitKind;
1010

‎clippy_lints/src/assign_ops.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use if_chain::if_chain;
22
use rustc::declare_lint_pass;
3-
use rustc::hir;
43
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
54
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
65
use rustc_errors::Applicability;
6+
use rustc_hir as hir;
77
use rustc_session::declare_tool_lint;
88

99
use crate::utils::{
@@ -232,7 +232,7 @@ fn lint_misrefactored_assign_op(
232232

233233
#[must_use]
234234
fn is_commutative(op: hir::BinOpKind) -> bool {
235-
use rustc::hir::BinOpKind::*;
235+
use rustc_hir::BinOpKind::*;
236236
match op {
237237
Add | Mul | And | Or | BitXor | BitAnd | BitOr | Eq | Ne => true,
238238
Sub | Div | Rem | Shl | Shr | Lt | Le | Ge | Gt => false,

‎clippy_lints/src/attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ use crate::utils::{
77
};
88
use if_chain::if_chain;
99
use rustc::declare_lint_pass;
10-
use rustc::hir::*;
1110
use rustc::lint::{
1211
in_external_macro, CheckLintNameResult, EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintArray,
1312
LintContext, LintPass,
1413
};
1514
use rustc::ty;
1615
use rustc_errors::Applicability;
16+
use rustc_hir::*;
1717
use rustc_session::declare_tool_lint;
1818
use rustc_span::source_map::Span;
1919
use rustc_span::symbol::Symbol;

‎clippy_lints/src/bit_mask.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use crate::consts::{constant, Constant};
22
use crate::utils::sugg::Sugg;
33
use crate::utils::{span_lint, span_lint_and_then};
44
use if_chain::if_chain;
5-
use rustc::hir::*;
65
use rustc::impl_lint_pass;
76
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
87
use rustc_errors::Applicability;
8+
use rustc_hir::*;
99
use rustc_session::declare_tool_lint;
1010
use rustc_span::source_map::Span;
1111
use syntax::ast::LitKind;

‎clippy_lints/src/blacklisted_name.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::utils::span_lint;
2-
use rustc::hir::*;
32
use rustc::impl_lint_pass;
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
54
use rustc_data_structures::fx::FxHashSet;
5+
use rustc_hir::*;
66
use rustc_session::declare_tool_lint;
77

88
declare_clippy_lint! {

‎clippy_lints/src/block_in_if_condition.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::utils::*;
22
use matches::matches;
33
use rustc::declare_lint_pass;
44
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
5-
use rustc::hir::*;
65
use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88

99
declare_clippy_lint! {
@@ -78,7 +78,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BlockInIfCondition {
7878
}
7979
if let Some((check, then, _)) = higher::if_block(&expr) {
8080
if let ExprKind::Block(block, _) = &check.kind {
81-
if block.rules == DefaultBlock {
81+
if block.rules == BlockCheckMode::DefaultBlock {
8282
if block.stmts.is_empty() {
8383
if let Some(ex) = &block.expr {
8484
// don't dig into the expression here, just suggest that they remove

‎clippy_lints/src/booleans.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ use crate::utils::{
44
};
55
use if_chain::if_chain;
66
use rustc::declare_lint_pass;
7+
use rustc::hir::intravisit;
78
use rustc::hir::intravisit::*;
8-
use rustc::hir::*;
99
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
1010
use rustc_errors::Applicability;
11+
use rustc_hir::*;
1112
use rustc_session::declare_tool_lint;
1213
use rustc_span::source_map::Span;
1314
use syntax::ast::LitKind;
@@ -109,7 +110,7 @@ impl<'a, 'tcx, 'v> Hir2Qmm<'a, 'tcx, 'v> {
109110
// prevent folding of `cfg!` macros and the like
110111
if !e.span.from_expansion() {
111112
match &e.kind {
112-
ExprKind::Unary(UnNot, inner) => return Ok(Bool::Not(box self.run(inner)?)),
113+
ExprKind::Unary(UnOp::UnNot, inner) => return Ok(Bool::Not(box self.run(inner)?)),
113114
ExprKind::Binary(binop, lhs, rhs) => match &binop.node {
114115
BinOpKind::Or => return Ok(Bool::Or(self.extract(BinOpKind::Or, &[lhs, rhs], Vec::new())?)),
115116
BinOpKind::And => return Ok(Bool::And(self.extract(BinOpKind::And, &[lhs, rhs], Vec::new())?)),
@@ -445,7 +446,7 @@ impl<'a, 'tcx> Visitor<'tcx> for NonminimalBoolVisitor<'a, 'tcx> {
445446
ExprKind::Binary(binop, _, _) if binop.node == BinOpKind::Or || binop.node == BinOpKind::And => {
446447
self.bool_expr(e)
447448
},
448-
ExprKind::Unary(UnNot, inner) => {
449+
ExprKind::Unary(UnOp::UnNot, inner) => {
449450
if self.cx.tables.node_types()[inner.hir_id].is_bool() {
450451
self.bool_expr(e);
451452
} else {
@@ -471,7 +472,7 @@ struct NotSimplificationVisitor<'a, 'tcx> {
471472

472473
impl<'a, 'tcx> Visitor<'tcx> for NotSimplificationVisitor<'a, 'tcx> {
473474
fn visit_expr(&mut self, expr: &'tcx Expr<'_>) {
474-
if let ExprKind::Unary(UnNot, inner) = &expr.kind {
475+
if let ExprKind::Unary(UnOp::UnNot, inner) = &expr.kind {
475476
if let Some(suggestion) = simplify_not(self.cx, inner) {
476477
span_lint_and_sugg(
477478
self.cx,

‎clippy_lints/src/bytecount.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ use crate::utils::{
44
};
55
use if_chain::if_chain;
66
use rustc::declare_lint_pass;
7-
use rustc::hir::*;
87
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
98
use rustc::ty;
109
use rustc_errors::Applicability;
10+
use rustc_hir::*;
1111
use rustc_session::declare_tool_lint;
1212
use syntax::ast::{Name, UintTy};
1313

‎clippy_lints/src/checked_conversions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
33
use if_chain::if_chain;
44
use rustc::declare_lint_pass;
5-
use rustc::hir::*;
65
use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintContext, LintPass};
76
use rustc_errors::Applicability;
7+
use rustc_hir::*;
88
use rustc_session::declare_tool_lint;
99
use syntax::ast::LitKind;
1010

‎clippy_lints/src/cognitive_complexity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! calculate cognitive complexity and warn about overly complex functions
22
33
use rustc::hir::intravisit::{walk_expr, FnKind, NestedVisitorMap, Visitor};
4-
use rustc::hir::*;
54
use rustc::impl_lint_pass;
65
use rustc::lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88
use rustc_span::source_map::Span;
99
use rustc_span::BytePos;

‎clippy_lints/src/comparison_chain.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::utils::{
22
get_trait_def_id, if_sequence, implements_trait, parent_node_is_if_expr, paths, span_help_and_lint, SpanlessEq,
33
};
44
use rustc::declare_lint_pass;
5-
use rustc::hir::*;
65
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88

99
declare_clippy_lint! {

‎clippy_lints/src/consts.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
use crate::utils::{clip, higher, sext, unsext};
44
use if_chain::if_chain;
5-
use rustc::hir::def::{DefKind, Res};
6-
use rustc::hir::*;
75
use rustc::lint::LateContext;
86
use rustc::ty::subst::{Subst, SubstsRef};
97
use rustc::ty::{self, Ty, TyCtxt};
108
use rustc::{bug, span_bug};
119
use rustc_data_structures::sync::Lrc;
10+
use rustc_hir::def::{DefKind, Res};
11+
use rustc_hir::*;
1212
use rustc_span::symbol::Symbol;
1313
use std::cmp::Ordering::{self, Equal};
1414
use std::cmp::PartialOrd;
@@ -240,9 +240,9 @@ impl<'c, 'cc> ConstEvalLateContext<'c, 'cc> {
240240
self.expr(value).map(|v| Constant::Repeat(Box::new(v), n))
241241
},
242242
ExprKind::Unary(op, ref operand) => self.expr(operand).and_then(|o| match op {
243-
UnNot => self.constant_not(&o, self.tables.expr_ty(e)),
244-
UnNeg => self.constant_negate(&o, self.tables.expr_ty(e)),
245-
UnDeref => Some(o),
243+
UnOp::UnNot => self.constant_not(&o, self.tables.expr_ty(e)),
244+
UnOp::UnNeg => self.constant_negate(&o, self.tables.expr_ty(e)),
245+
UnOp::UnDeref => Some(o),
246246
}),
247247
ExprKind::Binary(op, ref left, ref right) => self.binop(op, left, right),
248248
ExprKind::Call(ref callee, ref args) => {

‎clippy_lints/src/copies.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::utils::{get_parent_expr, higher, if_sequence, same_tys, snippet, span_lint_and_then, span_note_and_lint};
22
use crate::utils::{SpanlessEq, SpanlessHash};
33
use rustc::declare_lint_pass;
4-
use rustc::hir::*;
54
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
65
use rustc::ty::Ty;
76
use rustc_data_structures::fx::FxHashMap;
7+
use rustc_hir::*;
88
use rustc_session::declare_tool_lint;
99
use rustc_span::symbol::Symbol;
1010
use std::collections::hash_map::Entry;

‎clippy_lints/src/copy_iterator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::utils::{is_copy, match_path, paths, span_note_and_lint};
22
use rustc::declare_lint_pass;
3-
use rustc::hir::{Item, ItemKind};
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
4+
use rustc_hir::{Item, ItemKind};
55
use rustc_session::declare_tool_lint;
66

77
declare_clippy_lint! {

‎clippy_lints/src/default_trait_access.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use if_chain::if_chain;
22
use rustc::declare_lint_pass;
3-
use rustc::hir::*;
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
54
use rustc::ty;
65
use rustc_errors::Applicability;
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88

99
use crate::utils::{any_parent_is_automatically_derived, match_def_path, paths, span_lint_and_sugg};

‎clippy_lints/src/derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use crate::utils::paths;
22
use crate::utils::{is_automatically_derived, is_copy, match_path, span_lint_and_then};
33
use if_chain::if_chain;
44
use rustc::declare_lint_pass;
5-
use rustc::hir::*;
65
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
76
use rustc::ty::{self, Ty};
7+
use rustc_hir::*;
88
use rustc_session::declare_tool_lint;
99
use rustc_span::source_map::Span;
1010

‎clippy_lints/src/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::utils::{match_type, paths, return_ty, span_lint};
22
use itertools::Itertools;
3-
use rustc::hir;
43
use rustc::impl_lint_pass;
54
use rustc::lint::{in_external_macro, LateContext, LateLintPass, LintArray, LintPass};
65
use rustc_data_structures::fx::FxHashSet;
6+
use rustc_hir as hir;
77
use rustc_session::declare_tool_lint;
88
use rustc_span::source_map::{BytePos, MultiSpan, Span};
99
use rustc_span::Pos;

‎clippy_lints/src/double_comparison.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! Lint on unnecessary double comparisons. Some examples:
22
33
use rustc::declare_lint_pass;
4-
use rustc::hir::*;
54
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
65
use rustc_errors::Applicability;
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88
use rustc_span::source_map::Span;
99

‎clippy_lints/src/drop_bounds.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::utils::{match_def_path, paths, span_lint};
22
use if_chain::if_chain;
33
use rustc::declare_lint_pass;
4-
use rustc::hir::*;
54
use rustc::lint::{LateLintPass, LintArray, LintPass};
5+
use rustc_hir::*;
66
use rustc_session::declare_tool_lint;
77

88
declare_clippy_lint! {

‎clippy_lints/src/drop_forget_ref.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::utils::{is_copy, match_def_path, paths, qpath_res, span_note_and_lint};
22
use if_chain::if_chain;
33
use rustc::declare_lint_pass;
4-
use rustc::hir::*;
54
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
65
use rustc::ty;
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88

99
declare_clippy_lint! {

‎clippy_lints/src/duration_subsec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use if_chain::if_chain;
22
use rustc::declare_lint_pass;
3-
use rustc::hir::*;
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
54
use rustc_errors::Applicability;
5+
use rustc_hir::*;
66
use rustc_session::declare_tool_lint;
77
use rustc_span::source_map::Spanned;
88

‎clippy_lints/src/empty_enum.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
use crate::utils::span_lint_and_then;
44
use rustc::declare_lint_pass;
5-
use rustc::hir::*;
65
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
6+
use rustc_hir::*;
77
use rustc_session::declare_tool_lint;
88

99
declare_clippy_lint! {

‎clippy_lints/src/entry.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::utils::{snippet_with_applicability, span_lint_and_then, walk_ptrs_ty}
44
use if_chain::if_chain;
55
use rustc::declare_lint_pass;
66
use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor};
7-
use rustc::hir::*;
87
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
98
use rustc_errors::Applicability;
9+
use rustc_hir::*;
1010
use rustc_session::declare_tool_lint;
1111
use rustc_span::source_map::Span;
1212

‎clippy_lints/src/enum_clike.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
use crate::consts::{miri_to_const, Constant};
55
use crate::utils::span_lint;
66
use rustc::declare_lint_pass;
7-
use rustc::hir::*;
87
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
98
use rustc::ty;
109
use rustc::ty::util::IntTypeExt;
10+
use rustc_hir::*;
1111
use rustc_session::declare_tool_lint;
1212
use std::convert::TryFrom;
1313
use syntax::ast::{IntTy, UintTy};

‎clippy_lints/src/enum_glob_use.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
33
use crate::utils::span_lint;
44
use rustc::declare_lint_pass;
5-
use rustc::hir::def::{DefKind, Res};
6-
use rustc::hir::*;
75
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
6+
use rustc_hir::def::{DefKind, Res};
7+
use rustc_hir::*;
88
use rustc_session::declare_tool_lint;
99
use rustc_span::source_map::Span;
1010

‎clippy_lints/src/eq_op.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::utils::{implements_trait, is_copy, multispan_sugg, snippet, span_lint, span_lint_and_then, SpanlessEq};
22
use rustc::declare_lint_pass;
3-
use rustc::hir::*;
43
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
54
use rustc_errors::Applicability;
5+
use rustc_hir::*;
66
use rustc_session::declare_tool_lint;
77

88
declare_clippy_lint! {

‎clippy_lints/src/erasing_op.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc::declare_lint_pass;
2-
use rustc::hir::*;
32
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3+
use rustc_hir::*;
44
use rustc_session::declare_tool_lint;
55
use rustc_span::source_map::Span;
66

‎clippy_lints/src/escape.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use rustc::hir::intravisit as visit;
2-
use rustc::hir::HirIdSet;
3-
use rustc::hir::{self, *};
42
use rustc::impl_lint_pass;
53
use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
64
use rustc::ty::layout::LayoutOf;
75
use rustc::ty::{self, Ty};
6+
use rustc_hir::HirIdSet;
7+
use rustc_hir::{self, *};
88
use rustc_session::declare_tool_lint;
99
use rustc_span::source_map::Span;
1010
use rustc_typeck::expr_use_visitor::*;
@@ -93,7 +93,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for BoxedLocal {
9393
}
9494

9595
// TODO: Replace with Map::is_argument(..) when it's fixed
96-
fn is_argument(map: &hir::map::Map<'_>, id: HirId) -> bool {
96+
fn is_argument(map: &rustc::hir::map::Map<'_>, id: HirId) -> bool {
9797
match map.find(id) {
9898
Some(Node::Binding(_)) => (),
9999
_ => return false,

0 commit comments

Comments
 (0)