Skip to content

Commit d4e7e5b

Browse files
authored
Access items through rustc_session instead of rustc_lint_defs (#14852)
Items such as the `declare_tool_lint!()` macro are publicly reexported from `rustc_lint_defs` to `rustc_session`. Use the latter for consistency. changelog: none
2 parents e34e8ac + e2b1de1 commit d4e7e5b

11 files changed

+10
-20
lines changed

clippy_lints_internal/src/almost_standard_lint_formulation.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
33
use regex::Regex;
44
use rustc_hir::{Attribute, Item, ItemKind, Mutability};
55
use rustc_lint::{LateContext, LateLintPass};
6-
use rustc_lint_defs::declare_tool_lint;
7-
use rustc_session::impl_lint_pass;
6+
use rustc_session::{declare_tool_lint, impl_lint_pass};
87

98
declare_tool_lint! {
109
/// ### What it does

clippy_lints_internal/src/collapsible_calls.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use clippy_utils::{SpanlessEq, is_lint_allowed, peel_blocks_with_stmt};
44
use rustc_errors::Applicability;
55
use rustc_hir::{Closure, Expr, ExprKind};
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_lint_defs::declare_tool_lint;
8-
use rustc_session::declare_lint_pass;
7+
use rustc_session::{declare_lint_pass, declare_tool_lint};
98
use rustc_span::Span;
109

1110
use std::borrow::{Borrow, Cow};

clippy_lints_internal/src/derive_deserialize_allowing_unknown.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ use rustc_hir::{
88
AttrArgs, AttrItem, AttrPath, Attribute, HirId, Impl, Item, ItemKind, Path, QPath, TraitRef, Ty, TyKind,
99
};
1010
use rustc_lint::{LateContext, LateLintPass};
11-
use rustc_lint_defs::declare_tool_lint;
1211
use rustc_middle::ty::TyCtxt;
13-
use rustc_session::declare_lint_pass;
12+
use rustc_session::{declare_lint_pass, declare_tool_lint};
1413
use rustc_span::sym;
1514

1615
declare_tool_lint! {

clippy_lints_internal/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ extern crate rustc_data_structures;
2525
extern crate rustc_errors;
2626
extern crate rustc_hir;
2727
extern crate rustc_lint;
28-
extern crate rustc_lint_defs;
2928
extern crate rustc_middle;
3029
extern crate rustc_session;
3130
extern crate rustc_span;

clippy_lints_internal/src/lint_without_lint_pass.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ use rustc_hir::hir_id::CRATE_HIR_ID;
1010
use rustc_hir::intravisit::Visitor;
1111
use rustc_hir::{ExprKind, HirId, Item, MutTy, Mutability, Path, TyKind};
1212
use rustc_lint::{LateContext, LateLintPass};
13-
use rustc_lint_defs::declare_tool_lint;
1413
use rustc_middle::hir::nested_filter;
15-
use rustc_session::impl_lint_pass;
14+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1615
use rustc_span::source_map::Spanned;
1716
use rustc_span::symbol::Symbol;
1817
use rustc_span::{Span, sym};

clippy_lints_internal/src/msrv_attr_impl.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ use clippy_utils::source::snippet;
44
use rustc_errors::Applicability;
55
use rustc_hir as hir;
66
use rustc_lint::{LateContext, LateLintPass, LintContext};
7-
use rustc_lint_defs::declare_tool_lint;
87
use rustc_middle::ty::{self, EarlyBinder, GenericArgKind};
9-
use rustc_session::declare_lint_pass;
8+
use rustc_session::{declare_lint_pass, declare_tool_lint};
109

1110
declare_tool_lint! {
1211
/// ### What it does

clippy_lints_internal/src/outer_expn_data_pass.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ use clippy_utils::{is_lint_allowed, method_calls};
44
use rustc_errors::Applicability;
55
use rustc_hir as hir;
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_lint_defs::declare_tool_lint;
8-
use rustc_session::declare_lint_pass;
7+
use rustc_session::{declare_lint_pass, declare_tool_lint};
98
use rustc_span::symbol::Symbol;
109

1110
declare_tool_lint! {

clippy_lints_internal/src/produce_ice.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use rustc_ast::ast::NodeId;
22
use rustc_ast::visit::FnKind;
33
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
4-
use rustc_lint_defs::declare_tool_lint;
5-
use rustc_session::declare_lint_pass;
4+
use rustc_session::{declare_lint_pass, declare_tool_lint};
65
use rustc_span::Span;
76

87
declare_tool_lint! {

clippy_lints_internal/src/symbols.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ use rustc_errors::Applicability;
66
use rustc_hir::def::{DefKind, Res};
77
use rustc_hir::{Expr, ExprKind, Lit, Node, Pat, PatExprKind, PatKind};
88
use rustc_lint::{LateContext, LateLintPass};
9-
use rustc_lint_defs::declare_tool_lint;
109
use rustc_middle::mir::ConstValue;
1110
use rustc_middle::ty;
12-
use rustc_session::impl_lint_pass;
11+
use rustc_session::{declare_tool_lint, impl_lint_pass};
1312
use rustc_span::symbol::Symbol;
1413
use rustc_span::{Span, sym};
1514

clippy_lints_internal/src/unnecessary_def_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use clippy_utils::{path_def_id, peel_ref_operators};
55
use rustc_hir::def_id::DefId;
66
use rustc_hir::{Expr, ExprKind};
77
use rustc_lint::{LateContext, LateLintPass};
8-
use rustc_lint_defs::{declare_lint_pass, declare_tool_lint};
98
use rustc_middle::mir::ConstValue;
9+
use rustc_session::{declare_lint_pass, declare_tool_lint};
1010
use rustc_span::symbol::Symbol;
1111

1212
declare_tool_lint! {

clippy_lints_internal/src/unsorted_clippy_utils_paths.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use clippy_utils::diagnostics::span_lint;
22
use rustc_ast::ast::{Crate, ItemKind, ModKind};
33
use rustc_lint::{EarlyContext, EarlyLintPass};
4-
use rustc_lint_defs::declare_tool_lint;
5-
use rustc_session::declare_lint_pass;
4+
use rustc_session::{declare_lint_pass, declare_tool_lint};
65

76
declare_tool_lint! {
87
/// ### What it does

0 commit comments

Comments
 (0)