Skip to content

Commit f23772c

Browse files
committed
Move lookup_path and similar into clippy_utils::paths
1 parent b768fbe commit f23772c

File tree

15 files changed

+243
-236
lines changed

15 files changed

+243
-236
lines changed

clippy_config/src/types.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use clippy_utils::PathNS;
1+
use clippy_utils::paths::{PathNS, find_crates, lookup_path};
22
use rustc_data_structures::fx::FxHashMap;
33
use rustc_errors::{Applicability, Diag};
44
use rustc_hir::PrimTy;
@@ -148,7 +148,7 @@ pub fn create_disallowed_map<const REPLACEMENT_ALLOWED: bool>(
148148
for disallowed_path in disallowed_paths {
149149
let path = disallowed_path.path();
150150
let sym_path: Vec<Symbol> = path.split("::").map(Symbol::intern).collect();
151-
let mut resolutions = clippy_utils::lookup_path(tcx, ns, &sym_path);
151+
let mut resolutions = lookup_path(tcx, ns, &sym_path);
152152
resolutions.retain(|&def_id| def_kind_predicate(tcx.def_kind(def_id)));
153153

154154
let (prim_ty, found_prim_ty) = if let &[name] = sym_path.as_slice()
@@ -164,10 +164,10 @@ pub fn create_disallowed_map<const REPLACEMENT_ALLOWED: bool>(
164164
&& !disallowed_path.allow_invalid
165165
// Don't warn about unloaded crates:
166166
// https://github.com/rust-lang/rust-clippy/pull/14397#issuecomment-2848328221
167-
&& (sym_path.len() < 2 || !clippy_utils::find_crates(tcx, sym_path[0]).is_empty())
167+
&& (sym_path.len() < 2 || !find_crates(tcx, sym_path[0]).is_empty())
168168
{
169169
// Relookup the path in an arbitrary namespace to get a good `expected, found` message
170-
let found_def_ids = clippy_utils::lookup_path(tcx, PathNS::Arbitrary, &sym_path);
170+
let found_def_ids = lookup_path(tcx, PathNS::Arbitrary, &sym_path);
171171
let message = if let Some(&def_id) = found_def_ids.first() {
172172
let (article, description) = tcx.article_and_description(def_id);
173173
format!("expected a {predicate_description}, found {article} {description}")

clippy_lints/src/await_holding_invalid.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_config::Conf;
22
use clippy_config::types::{DisallowedPathWithoutReplacement, create_disallowed_map};
33
use clippy_utils::diagnostics::span_lint_and_then;
4-
use clippy_utils::{PathNS, paths};
4+
use clippy_utils::paths::{self, PathNS};
55
use rustc_hir as hir;
66
use rustc_hir::def_id::{DefId, DefIdMap};
77
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/disallowed_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use clippy_config::Conf;
22
use clippy_config::types::{DisallowedPath, create_disallowed_map};
3-
use clippy_utils::PathNS;
43
use clippy_utils::diagnostics::{span_lint_and_then, span_lint_hir_and_then};
54
use clippy_utils::macros::macro_backtrace;
5+
use clippy_utils::paths::PathNS;
66
use rustc_data_structures::fx::FxHashSet;
77
use rustc_hir::def::DefKind;
88
use rustc_hir::def_id::DefIdMap;

clippy_lints/src/disallowed_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_config::Conf;
22
use clippy_config::types::{DisallowedPath, create_disallowed_map};
3-
use clippy_utils::PathNS;
43
use clippy_utils::diagnostics::span_lint_and_then;
4+
use clippy_utils::paths::PathNS;
55
use rustc_hir::def::{CtorKind, DefKind, Res};
66
use rustc_hir::def_id::DefIdMap;
77
use rustc_hir::{Expr, ExprKind};

clippy_lints/src/disallowed_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_config::Conf;
22
use clippy_config::types::{DisallowedPath, create_disallowed_map};
3-
use clippy_utils::PathNS;
43
use clippy_utils::diagnostics::span_lint_and_then;
4+
use clippy_utils::paths::PathNS;
55
use rustc_data_structures::fx::FxHashMap;
66
use rustc_hir::def::{DefKind, Res};
77
use rustc_hir::def_id::DefIdMap;

clippy_lints/src/functions/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod too_many_lines;
1010

1111
use clippy_config::Conf;
1212
use clippy_utils::msrvs::Msrv;
13-
use clippy_utils::{PathNS, lookup_path_str};
13+
use clippy_utils::paths::{PathNS, lookup_path_str};
1414
use rustc_hir as hir;
1515
use rustc_hir::intravisit;
1616
use rustc_lint::{LateContext, LateLintPass};

clippy_lints/src/missing_enforced_import_rename.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_sugg;
3+
use clippy_utils::paths::{PathNS, lookup_path_str};
34
use clippy_utils::source::SpanRangeExt;
4-
use clippy_utils::{PathNS, lookup_path_str};
55
use rustc_errors::Applicability;
66
use rustc_hir::def::Res;
77
use rustc_hir::def_id::DefIdMap;

clippy_lints/src/non_std_lazy_statics.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use clippy_config::Conf;
22
use clippy_utils::diagnostics::{span_lint, span_lint_and_then};
33
use clippy_utils::msrvs::{self, Msrv};
4+
use clippy_utils::paths::{self, PathNS, find_crates, lookup_path_str};
45
use clippy_utils::visitors::for_each_expr;
5-
use clippy_utils::{PathNS, find_crates, fn_def_id, is_no_std_crate, lookup_path_str, path_def_id, paths, sym};
6+
use clippy_utils::{fn_def_id, is_no_std_crate, path_def_id, sym};
67
use rustc_data_structures::fx::FxIndexMap;
78
use rustc_errors::Applicability;
89
use rustc_hir::def::{DefKind, Res};

clippy_lints_internal/src/internal_paths.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use clippy_utils::paths::PathLookup;
2-
use clippy_utils::{PathNS, sym, type_path, value_path};
1+
use clippy_utils::paths::{PathLookup, PathNS};
2+
use clippy_utils::{sym, type_path, value_path};
33

44
// Paths inside rustc
55
pub static EARLY_LINT_PASS: PathLookup = type_path!(rustc_lint::passes::EarlyLintPass);

clippy_lints_internal/src/unnecessary_def_path.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::internal_paths;
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::{PathNS, lookup_path, path_def_id, peel_ref_operators};
3+
use clippy_utils::paths::{PathNS, lookup_path};
4+
use clippy_utils::{path_def_id, peel_ref_operators};
45
use rustc_hir::def_id::DefId;
56
use rustc_hir::{Expr, ExprKind};
67
use rustc_lint::{LateContext, LateLintPass};

0 commit comments

Comments
 (0)