Skip to content

Commit 16e347f

Browse files
committed
Auto merge of #7284 - camsteffen:consts-reexport, r=flip1995
Remove clippy_utils::consts re-export changelog: none We got a straggler.
2 parents 5cb49bc + d39a11c commit 16e347f

31 files changed

+29
-35
lines changed

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;

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};

clippy_lints/src/assertions_on_constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::{constant, Constant};
1+
use clippy_utils::consts::{constant, Constant};
22
use clippy_utils::diagnostics::span_lint_and_help;
33
use clippy_utils::source::snippet_opt;
44
use clippy_utils::{is_direct_expn_of, is_expn_of, match_panic_call};

clippy_lints/src/bit_mask.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::{constant, Constant};
1+
use clippy_utils::consts::{constant, Constant};
22
use clippy_utils::diagnostics::{span_lint, span_lint_and_then};
33
use clippy_utils::sugg::Sugg;
44
use if_chain::if_chain;

clippy_lints/src/casts/cast_sign_loss.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::{constant, Constant};
1+
use clippy_utils::consts::{constant, Constant};
22
use clippy_utils::diagnostics::span_lint;
33
use clippy_utils::{method_chain_args, sext};
44
use if_chain::if_chain;

clippy_lints/src/consts.rs

Lines changed: 0 additions & 1 deletion
This file was deleted.

clippy_lints/src/duration_subsec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_lint::{LateContext, LateLintPass};
77
use rustc_session::{declare_lint_pass, declare_tool_lint};
88
use rustc_span::source_map::Spanned;
99

10-
use crate::consts::{constant, Constant};
10+
use clippy_utils::consts::{constant, Constant};
1111
use clippy_utils::diagnostics::span_lint_and_sugg;
1212
use clippy_utils::paths;
1313

clippy_lints/src/enum_clike.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! lint on C-like enums that are `repr(isize/usize)` and have values that
22
//! don't fit into an `i32`
33
4-
use crate::consts::{miri_to_const, Constant};
4+
use clippy_utils::consts::{miri_to_const, Constant};
55
use clippy_utils::diagnostics::span_lint;
66
use rustc_hir::{Item, ItemKind};
77
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/erasing_op.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
use clippy_utils::consts::{constant_simple, Constant};
12
use clippy_utils::diagnostics::span_lint;
23
use rustc_hir::{BinOpKind, Expr, ExprKind};
34
use rustc_lint::{LateContext, LateLintPass};
45
use rustc_session::{declare_lint_pass, declare_tool_lint};
56
use rustc_span::source_map::Span;
67

7-
use crate::consts::{constant_simple, Constant};
8-
98
declare_clippy_lint! {
109
/// **What it does:** Checks for erasing operations, e.g., `x * 0`.
1110
///

clippy_lints/src/floating_point_arithmetic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::consts::{
1+
use clippy_utils::consts::{
22
constant, constant_simple, Constant,
33
Constant::{Int, F32, F64},
44
};

0 commit comments

Comments
 (0)