Skip to content

Commit aee89cd

Browse files
petrochenkovpetrochenkov
committed
Update clippy
1 parent 245d559 commit aee89cd

27 files changed

+54
-64
lines changed

‎clippy_lints/src/approx_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
22
use clippy_utils::{meets_msrv, msrvs};
33
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
44
use rustc_hir::{Expr, ExprKind};
5-
use rustc_lint::{LateContext, LateLintPass, LintContext};
5+
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_semver::RustcVersion;
77
use rustc_session::{declare_tool_lint, impl_lint_pass};
88
use rustc_span::symbol;

‎clippy_lints/src/as_conversions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use rustc_ast::ast::{Expr, ExprKind};
3-
use rustc_lint::{EarlyContext, EarlyLintPass};
3+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
44
use rustc_middle::lint::in_external_macro;
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66

@@ -48,7 +48,7 @@ declare_lint_pass!(AsConversions => [AS_CONVERSIONS]);
4848

4949
impl EarlyLintPass for AsConversions {
5050
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
51-
if in_external_macro(cx.sess, expr.span) {
51+
if in_external_macro(cx.sess(), expr.span) {
5252
return;
5353
}
5454

‎clippy_lints/src/disallowed_script_idents.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint;
22
use rustc_ast::ast;
33
use rustc_data_structures::fx::FxHashSet;
4-
use rustc_lint::{EarlyContext, EarlyLintPass, Level};
4+
use rustc_lint::{EarlyContext, EarlyLintPass, Level, LintContext};
55
use rustc_session::{declare_tool_lint, impl_lint_pass};
66
use unicode_script::{Script, UnicodeScript};
77

@@ -72,7 +72,7 @@ impl EarlyLintPass for DisallowedScriptIdents {
7272
return;
7373
}
7474

75-
let symbols = cx.sess.parse_sess.symbol_gallery.symbols.lock();
75+
let symbols = cx.sess().parse_sess.symbol_gallery.symbols.lock();
7676
// Sort by `Span` so that error messages make sense with respect to the
7777
// order of identifier locations in the code.
7878
let mut symbols: Vec<_> = symbols.iter().collect();

‎clippy_lints/src/else_if_without_else.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use clippy_utils::diagnostics::span_lint_and_help;
44
use rustc_ast::ast::{Expr, ExprKind};
5-
use rustc_lint::{EarlyContext, EarlyLintPass};
5+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
66
use rustc_middle::lint::in_external_macro;
77
use rustc_session::{declare_lint_pass, declare_tool_lint};
88

@@ -50,7 +50,7 @@ declare_lint_pass!(ElseIfWithoutElse => [ELSE_IF_WITHOUT_ELSE]);
5050

5151
impl EarlyLintPass for ElseIfWithoutElse {
5252
fn check_expr(&mut self, cx: &EarlyContext<'_>, mut item: &Expr) {
53-
if in_external_macro(cx.sess, item.span) {
53+
if in_external_macro(cx.sess(), item.span) {
5454
return;
5555
}
5656

‎clippy_lints/src/formatting.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use clippy_utils::differing_macro_contexts;
33
use clippy_utils::source::snippet_opt;
44
use if_chain::if_chain;
55
use rustc_ast::ast::{BinOpKind, Block, Expr, ExprKind, StmtKind, UnOp};
6-
use rustc_lint::{EarlyContext, EarlyLintPass};
6+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
77
use rustc_middle::lint::in_external_macro;
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99
use rustc_span::source_map::Span;
@@ -207,7 +207,7 @@ fn check_else(cx: &EarlyContext<'_>, expr: &Expr) {
207207
if let ExprKind::If(_, then, Some(else_)) = &expr.kind;
208208
if is_block(else_) || is_if(else_);
209209
if !differing_macro_contexts(then.span, else_.span);
210-
if !then.span.from_expansion() && !in_external_macro(cx.sess, expr.span);
210+
if !then.span.from_expansion() && !in_external_macro(cx.sess(), expr.span);
211211

212212
// workaround for rust-lang/rust#43081
213213
if expr.span.lo().0 != 0 && expr.span.hi().0 != 0;
@@ -259,7 +259,7 @@ fn has_unary_equivalent(bin_op: BinOpKind) -> bool {
259259
}
260260

261261
fn indentation(cx: &EarlyContext<'_>, span: Span) -> usize {
262-
cx.sess.source_map().lookup_char_pos(span.lo()).col.0
262+
cx.sess().source_map().lookup_char_pos(span.lo()).col.0
263263
}
264264

265265
/// Implementation of the `POSSIBLE_MISSING_COMMA` lint for array

‎clippy_lints/src/from_over_into.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_help;
22
use clippy_utils::{meets_msrv, msrvs};
33
use if_chain::if_chain;
44
use rustc_hir as hir;
5-
use rustc_lint::{LateContext, LateLintPass, LintContext};
5+
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_semver::RustcVersion;
77
use rustc_session::{declare_tool_lint, impl_lint_pass};
88
use rustc_span::symbol::sym;

‎clippy_lints/src/index_refutable_slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
88
use rustc_errors::Applicability;
99
use rustc_hir as hir;
1010
use rustc_hir::intravisit::{self, Visitor};
11-
use rustc_lint::{LateContext, LateLintPass, LintContext};
11+
use rustc_lint::{LateContext, LateLintPass};
1212
use rustc_middle::hir::nested_filter;
1313
use rustc_middle::ty;
1414
use rustc_semver::RustcVersion;

‎clippy_lints/src/items_after_statements.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use clippy_utils::diagnostics::span_lint;
44
use rustc_ast::ast::{Block, ItemKind, StmtKind};
5-
use rustc_lint::{EarlyContext, EarlyLintPass};
5+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
66
use rustc_middle::lint::in_external_macro;
77
use rustc_session::{declare_lint_pass, declare_tool_lint};
88

@@ -55,7 +55,7 @@ declare_lint_pass!(ItemsAfterStatements => [ITEMS_AFTER_STATEMENTS]);
5555

5656
impl EarlyLintPass for ItemsAfterStatements {
5757
fn check_block(&mut self, cx: &EarlyContext<'_>, item: &Block) {
58-
if in_external_macro(cx.sess, item.span) {
58+
if in_external_macro(cx.sess(), item.span) {
5959
return;
6060
}
6161

@@ -69,7 +69,7 @@ impl EarlyLintPass for ItemsAfterStatements {
6969
// lint on all further items
7070
for stmt in stmts {
7171
if let StmtKind::Item(ref it) = *stmt {
72-
if in_external_macro(cx.sess, it.span) {
72+
if in_external_macro(cx.sess(), it.span) {
7373
return;
7474
}
7575
if let ItemKind::MacroDef(..) = it.kind {

‎clippy_lints/src/literal_representation.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use clippy_utils::source::snippet_opt;
77
use if_chain::if_chain;
88
use rustc_ast::ast::{Expr, ExprKind, Lit, LitKind};
99
use rustc_errors::Applicability;
10-
use rustc_lint::{EarlyContext, EarlyLintPass};
10+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
1111
use rustc_middle::lint::in_external_macro;
1212
use rustc_session::{declare_tool_lint, impl_lint_pass};
1313
use std::iter;
@@ -225,7 +225,7 @@ impl_lint_pass!(LiteralDigitGrouping => [
225225

226226
impl EarlyLintPass for LiteralDigitGrouping {
227227
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
228-
if in_external_macro(cx.sess, expr.span) {
228+
if in_external_macro(cx.sess(), expr.span) {
229229
return;
230230
}
231231

@@ -418,7 +418,7 @@ impl_lint_pass!(DecimalLiteralRepresentation => [DECIMAL_LITERAL_REPRESENTATION]
418418

419419
impl EarlyLintPass for DecimalLiteralRepresentation {
420420
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
421-
if in_external_macro(cx.sess, expr.span) {
421+
if in_external_macro(cx.sess(), expr.span) {
422422
return;
423423
}
424424

‎clippy_lints/src/manual_non_exhaustive.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use clippy_utils::{meets_msrv, msrvs};
55
use if_chain::if_chain;
66
use rustc_ast::ast::{FieldDef, Item, ItemKind, Variant, VariantData, VisibilityKind};
77
use rustc_errors::Applicability;
8-
use rustc_lint::{EarlyContext, EarlyLintPass};
8+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
99
use rustc_semver::RustcVersion;
1010
use rustc_session::{declare_tool_lint, impl_lint_pass};
1111
use rustc_span::{sym, Span};
@@ -116,7 +116,7 @@ fn check_manual_non_exhaustive_enum(cx: &EarlyContext<'_>, item: &Item, variants
116116
|diag| {
117117
if_chain! {
118118
if !item.attrs.iter().any(|attr| attr.has_name(sym::non_exhaustive));
119-
let header_span = cx.sess.source_map().span_until_char(item.span, '{');
119+
let header_span = cx.sess().source_map().span_until_char(item.span, '{');
120120
if let Some(snippet) = snippet_opt(cx, header_span);
121121
then {
122122
diag.span_suggestion(
@@ -149,7 +149,7 @@ fn check_manual_non_exhaustive_struct(cx: &EarlyContext<'_>, item: &Item, data:
149149
VariantData::Unit(_) => unreachable!("`VariantData::Unit` is already handled above"),
150150
};
151151

152-
cx.sess.source_map().span_until_char(item.span, delimiter)
152+
cx.sess().source_map().span_until_char(item.span, delimiter)
153153
}
154154

155155
let fields = data.fields();

‎clippy_lints/src/manual_strip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_hir::def::Res;
99
use rustc_hir::intravisit::{walk_expr, Visitor};
1010
use rustc_hir::BinOpKind;
1111
use rustc_hir::{BorrowKind, Expr, ExprKind};
12-
use rustc_lint::{LateContext, LateLintPass, LintContext};
12+
use rustc_lint::{LateContext, LateLintPass};
1313
use rustc_middle::ty;
1414
use rustc_semver::RustcVersion;
1515
use rustc_session::{declare_tool_lint, impl_lint_pass};

‎clippy_lints/src/matches.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_hir::{
2525
Mutability, Node, Pat, PatKind, PathSegment, QPath, RangeEnd, TyKind,
2626
};
2727
use rustc_hir::{HirIdMap, HirIdSet};
28-
use rustc_lint::{LateContext, LateLintPass, LintContext};
28+
use rustc_lint::{LateContext, LateLintPass};
2929
use rustc_middle::ty::{self, Ty, TyS, VariantDef};
3030
use rustc_semver::RustcVersion;
3131
use rustc_session::{declare_tool_lint, impl_lint_pass};

‎clippy_lints/src/mem_replace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use if_chain::if_chain;
66
use rustc_errors::Applicability;
77
use rustc_hir::LangItem::OptionNone;
88
use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, QPath};
9-
use rustc_lint::{LateContext, LateLintPass, LintContext};
9+
use rustc_lint::{LateContext, LateLintPass};
1010
use rustc_middle::lint::in_external_macro;
1111
use rustc_semver::RustcVersion;
1212
use rustc_session::{declare_tool_lint, impl_lint_pass};

‎clippy_lints/src/misc_early/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use clippy_utils::source::snippet_opt;
1212
use rustc_ast::ast::{Expr, ExprKind, Generics, Lit, LitFloatType, LitIntType, LitKind, NodeId, Pat, PatKind};
1313
use rustc_ast::visit::FnKind;
1414
use rustc_data_structures::fx::FxHashMap;
15-
use rustc_lint::{EarlyContext, EarlyLintPass};
15+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
1616
use rustc_middle::lint::in_external_macro;
1717
use rustc_session::{declare_lint_pass, declare_tool_lint};
1818
use rustc_span::source_map::Span;
@@ -342,7 +342,7 @@ impl EarlyLintPass for MiscEarlyLints {
342342
}
343343

344344
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
345-
if in_external_macro(cx.sess, expr.span) {
345+
if in_external_macro(cx.sess(), expr.span) {
346346
return;
347347
}
348348

‎clippy_lints/src/missing_const_for_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use clippy_utils::{fn_has_unsatisfiable_preds, is_entrypoint_fn, meets_msrv, msr
55
use rustc_hir as hir;
66
use rustc_hir::intravisit::FnKind;
77
use rustc_hir::{Body, Constness, FnDecl, GenericParamKind, HirId};
8-
use rustc_lint::{LateContext, LateLintPass, LintContext};
8+
use rustc_lint::{LateContext, LateLintPass};
99
use rustc_middle::lint::in_external_macro;
1010
use rustc_semver::RustcVersion;
1111
use rustc_session::{declare_tool_lint, impl_lint_pass};

‎clippy_lints/src/module_style.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ impl EarlyLintPass for ModStyle {
8080
return;
8181
}
8282

83-
let files = cx.sess.source_map().files();
83+
let files = cx.sess().source_map().files();
8484

85-
let trim_to_src = if let RealFileName::LocalPath(p) = &cx.sess.opts.working_dir {
85+
let trim_to_src = if let RealFileName::LocalPath(p) = &cx.sess().opts.working_dir {
8686
p.to_string_lossy()
8787
} else {
8888
return;

‎clippy_lints/src/non_expressive_names.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use rustc_ast::ast::{
33
self, Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, Pat, PatKind,
44
};
55
use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
6-
use rustc_lint::{EarlyContext, EarlyLintPass};
6+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
77
use rustc_middle::lint::in_external_macro;
88
use rustc_session::{declare_tool_lint, impl_lint_pass};
99
use rustc_span::source_map::Span;
@@ -356,7 +356,7 @@ impl<'a, 'tcx> Visitor<'tcx> for SimilarNamesLocalVisitor<'a, 'tcx> {
356356

357357
impl EarlyLintPass for NonExpressiveNames {
358358
fn check_item(&mut self, cx: &EarlyContext<'_>, item: &Item) {
359-
if in_external_macro(cx.sess, item.span) {
359+
if in_external_macro(cx.sess(), item.span) {
360360
return;
361361
}
362362

@@ -371,7 +371,7 @@ impl EarlyLintPass for NonExpressiveNames {
371371
}
372372

373373
fn check_impl_item(&mut self, cx: &EarlyContext<'_>, item: &AssocItem) {
374-
if in_external_macro(cx.sess, item.span) {
374+
if in_external_macro(cx.sess(), item.span) {
375375
return;
376376
}
377377

‎clippy_lints/src/octal_escapes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_then;
22
use rustc_ast::ast::{Expr, ExprKind};
33
use rustc_ast::token::{Lit, LitKind};
44
use rustc_errors::Applicability;
5-
use rustc_lint::{EarlyContext, EarlyLintPass};
5+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
66
use rustc_middle::lint::in_external_macro;
77
use rustc_session::{declare_lint_pass, declare_tool_lint};
88
use rustc_span::Span;
@@ -51,7 +51,7 @@ declare_lint_pass!(OctalEscapes => [OCTAL_ESCAPES]);
5151

5252
impl EarlyLintPass for OctalEscapes {
5353
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
54-
if in_external_macro(cx.sess, expr.span) {
54+
if in_external_macro(cx.sess(), expr.span) {
5555
return;
5656
}
5757

‎clippy_lints/src/ranges.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use if_chain::if_chain;
88
use rustc_ast::ast::RangeLimits;
99
use rustc_errors::Applicability;
1010
use rustc_hir::{BinOpKind, Expr, ExprKind, PathSegment, QPath};
11-
use rustc_lint::{LateContext, LateLintPass, LintContext};
11+
use rustc_lint::{LateContext, LateLintPass};
1212
use rustc_middle::ty;
1313
use rustc_semver::RustcVersion;
1414
use rustc_session::{declare_tool_lint, impl_lint_pass};

‎clippy_lints/src/redundant_closure_call.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_errors::Applicability;
88
use rustc_hir as hir;
99
use rustc_hir::intravisit as hir_visit;
1010
use rustc_hir::intravisit::Visitor as HirVisitor;
11-
use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass};
11+
use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
1212
use rustc_middle::hir::nested_filter;
1313
use rustc_middle::lint::in_external_macro;
1414
use rustc_session::{declare_lint_pass, declare_tool_lint};
@@ -62,7 +62,7 @@ impl<'ast> ast_visit::Visitor<'ast> for ReturnVisitor {
6262

6363
impl EarlyLintPass for RedundantClosureCall {
6464
fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &ast::Expr) {
65-
if in_external_macro(cx.sess, expr.span) {
65+
if in_external_macro(cx.sess(), expr.span) {
6666
return;
6767
}
6868
if_chain! {

‎clippy_lints/src/redundant_else.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use rustc_ast::ast::{Block, Expr, ExprKind, Stmt, StmtKind};
33
use rustc_ast::visit::{walk_expr, Visitor};
4-
use rustc_lint::{EarlyContext, EarlyLintPass};
4+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
55
use rustc_middle::lint::in_external_macro;
66
use rustc_session::{declare_lint_pass, declare_tool_lint};
77

@@ -46,7 +46,7 @@ declare_lint_pass!(RedundantElse => [REDUNDANT_ELSE]);
4646

4747
impl EarlyLintPass for RedundantElse {
4848
fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
49-
if in_external_macro(cx.sess, stmt.span) {
49+
if in_external_macro(cx.sess(), stmt.span) {
5050
return;
5151
}
5252
// Only look at expressions that are a whole statement

‎clippy_lints/src/redundant_field_names.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::{meets_msrv, msrvs};
33
use rustc_ast::ast::{Expr, ExprKind};
44
use rustc_errors::Applicability;
5-
use rustc_lint::{EarlyContext, EarlyLintPass};
5+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
66
use rustc_middle::lint::in_external_macro;
77
use rustc_semver::RustcVersion;
88
use rustc_session::{declare_tool_lint, impl_lint_pass};
@@ -55,7 +55,7 @@ impl EarlyLintPass for RedundantFieldNames {
5555
return;
5656
}
5757

58-
if in_external_macro(cx.sess, expr.span) {
58+
if in_external_macro(cx.sess(), expr.span) {
5959
return;
6060
}
6161
if let ExprKind::Struct(ref se) = expr.kind {

‎clippy_lints/src/single_char_lifetime_names.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use rustc_ast::ast::{GenericParam, GenericParamKind};
3-
use rustc_lint::{EarlyContext, EarlyLintPass};
3+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
44
use rustc_middle::lint::in_external_macro;
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66

@@ -43,7 +43,7 @@ declare_lint_pass!(SingleCharLifetimeNames => [SINGLE_CHAR_LIFETIME_NAMES]);
4343

4444
impl EarlyLintPass for SingleCharLifetimeNames {
4545
fn check_generic_param(&mut self, ctx: &EarlyContext<'_>, param: &GenericParam) {
46-
if in_external_macro(ctx.sess, param.ident.span) {
46+
if in_external_macro(ctx.sess(), param.ident.span) {
4747
return;
4848
}
4949

‎clippy_lints/src/single_component_path_imports.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_sugg};
22
use rustc_ast::{ptr::P, Crate, Item, ItemKind, MacroDef, ModKind, UseTreeKind, VisibilityKind};
33
use rustc_errors::Applicability;
4-
use rustc_lint::{EarlyContext, EarlyLintPass};
4+
use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66
use rustc_span::{edition::Edition, symbol::kw, Span, Symbol};
77

@@ -37,7 +37,7 @@ declare_lint_pass!(SingleComponentPathImports => [SINGLE_COMPONENT_PATH_IMPORTS]
3737

3838
impl EarlyLintPass for SingleComponentPathImports {
3939
fn check_crate(&mut self, cx: &EarlyContext<'_>, krate: &Crate) {
40-
if cx.sess.opts.edition < Edition::Edition2018 {
40+
if cx.sess().opts.edition < Edition::Edition2018 {
4141
return;
4242
}
4343
check_mod(cx, &krate.items);

0 commit comments

Comments
 (0)