Skip to content

Commit 94805ce

Browse files
authored
Rollup merge of #124876 - nnethercote:rm-use-crate-rustc_foo, r=compiler-errors
Simplify `use crate::rustc_foo::bar` occurrences. They can just be written as `use rustc_foo::bar`, which is far more standard. (I didn't even know that a `crate::` prefix was valid.) r? ``@eholk``
2 parents 0ac7c62 + 0eff5a0 commit 94805ce

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

clippy_lints/src/manual_assert.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
use crate::rustc_lint::LintContext;
21
use clippy_utils::diagnostics::span_lint_and_then;
32
use clippy_utils::macros::{is_panic, root_macro_call};
43
use clippy_utils::{is_else_clause, is_parent_stmt, peel_blocks_with_stmt, span_extract_comment, sugg};
54
use rustc_errors::Applicability;
65
use rustc_hir::{Expr, ExprKind, UnOp};
7-
use rustc_lint::{LateContext, LateLintPass};
6+
use rustc_lint::{LateContext, LateLintPass, LintContext};
87
use rustc_session::declare_lint_pass;
98

109
declare_clippy_lint! {

clippy_lints/src/methods/iter_overeager_cloned.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use rustc_lint::LateContext;
99
use rustc_middle::mir::{FakeReadCause, Mutability};
1010
use rustc_middle::ty::{self, BorrowKind};
1111
use rustc_span::sym;
12+
use rustc_trait_selection::infer::TyCtxtInferExt;
1213

1314
use super::ITER_OVEREAGER_CLONED;
1415
use crate::redundant_clone::REDUNDANT_CLONE;
15-
use crate::rustc_trait_selection::infer::TyCtxtInferExt;
1616

1717
#[derive(Clone, Copy)]
1818
pub(super) enum Op<'a> {

clippy_lints/src/redundant_closure_call.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::rustc_lint::LintContext;
21
use clippy_utils::diagnostics::{span_lint_and_then, span_lint_hir};
32
use clippy_utils::get_parent_expr;
43
use clippy_utils::sugg::Sugg;
@@ -9,7 +8,7 @@ use rustc_hir::intravisit::{Visitor as HirVisitor, Visitor};
98
use rustc_hir::{
109
intravisit as hir_visit, ClosureKind, CoroutineDesugaring, CoroutineKind, CoroutineSource, ExprKind, Node,
1110
};
12-
use rustc_lint::{LateContext, LateLintPass};
11+
use rustc_lint::{LateContext, LateLintPass, LintContext};
1312
use rustc_middle::hir::nested_filter;
1413
use rustc_middle::lint::in_external_macro;
1514
use rustc_middle::ty;

clippy_lints/src/semicolon_if_nothing_returned.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use crate::rustc_lint::LintContext;
21
use clippy_utils::diagnostics::span_lint_and_sugg;
32
use clippy_utils::source::snippet_with_context;
43
use rustc_errors::Applicability;
54
use rustc_hir::{Block, ExprKind};
6-
use rustc_lint::{LateContext, LateLintPass};
5+
use rustc_lint::{LateContext, LateLintPass, LintContext};
76
use rustc_session::declare_lint_pass;
87
use rustc_span::{ExpnKind, MacroKind, Span};
98

0 commit comments

Comments
 (0)