Skip to content

Commit bd73fa0

Browse files
committed
Auto merge of rust-lang#152624 - camsteffen:symbols-audit, r=petrochenkov
Audit Symbols *[View all comments](https://triagebot.infra.rust-lang.org/gh-comments/rust-lang/rust/pull/152624)* Remove unused symbols and hoist some symbols to Clippy.
2 parents 87b3f55 + 17a6d61 commit bd73fa0

88 files changed

Lines changed: 357 additions & 149 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

clippy_lints/src/await_holding_invalid.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ use clippy_config::Conf;
22
use clippy_config::types::{DisallowedPathWithoutReplacement, create_disallowed_map};
33
use clippy_utils::diagnostics::span_lint_and_then;
44
use clippy_utils::paths::{self, PathNS};
5+
use clippy_utils::sym;
56
use rustc_hir as hir;
67
use rustc_hir::def_id::{DefId, DefIdMap};
78
use rustc_lint::{LateContext, LateLintPass};
89
use rustc_middle::mir::CoroutineLayout;
910
use rustc_middle::ty::TyCtxt;
1011
use rustc_session::impl_lint_pass;
11-
use rustc_span::{Span, sym};
12+
use rustc_span::Span;
1213

1314
declare_clippy_lint! {
1415
/// ### What it does

clippy_lints/src/box_default.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2-
use clippy_utils::is_default_equivalent;
2+
use clippy_utils::{is_default_equivalent, sym};
33
use clippy_utils::macros::macro_backtrace;
44
use clippy_utils::res::{MaybeDef, MaybeResPath};
55
use clippy_utils::ty::expr_sig;
@@ -9,7 +9,7 @@ use rustc_hir::intravisit::{InferKind, Visitor, VisitorExt, walk_ty};
99
use rustc_hir::{AmbigArg, Block, Expr, ExprKind, HirId, LangItem, LetStmt, Node, QPath, Ty, TyKind};
1010
use rustc_lint::{LateContext, LateLintPass, LintContext};
1111
use rustc_session::declare_lint_pass;
12-
use rustc_span::{Span, sym};
12+
use rustc_span::Span;
1313

1414
declare_clippy_lint! {
1515
/// ### What it does

clippy_lints/src/casts/as_ptr_cast_mut.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::source::SpanRangeExt;
3+
use clippy_utils::sym;
34
use rustc_errors::Applicability;
45
use rustc_hir::{Expr, ExprKind};
56
use rustc_lint::LateContext;
@@ -12,7 +13,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &Expr<'_>, cast_expr: &Expr<'_>,
1213
if let ty::RawPtr(ptrty, Mutability::Mut) = cast_to.kind()
1314
&& let ty::RawPtr(_, Mutability::Not) = cx.typeck_results().node_type(cast_expr.hir_id).kind()
1415
&& let ExprKind::MethodCall(method_name, receiver, [], _) = cast_expr.peel_blocks().kind
15-
&& method_name.ident.name == rustc_span::sym::as_ptr
16+
&& method_name.ident.name == sym::as_ptr
1617
&& let Some(as_ptr_did) = cx
1718
.typeck_results()
1819
.type_dependent_def_id(cast_expr.peel_blocks().hir_id)

clippy_lints/src/casts/unnecessary_cast.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ use clippy_utils::numeric_literal::NumericLiteral;
33
use clippy_utils::res::MaybeResPath;
44
use clippy_utils::source::{SpanRangeExt, snippet_opt};
55
use clippy_utils::visitors::{Visitable, for_each_expr_without_closures};
6-
use clippy_utils::{get_parent_expr, is_hir_ty_cfg_dependant, is_ty_alias};
6+
use clippy_utils::{get_parent_expr, is_hir_ty_cfg_dependant, is_ty_alias, sym};
77
use rustc_ast::{LitFloatType, LitIntType, LitKind};
88
use rustc_errors::Applicability;
99
use rustc_hir::def::{DefKind, Res};
1010
use rustc_hir::{Expr, ExprKind, Lit, Node, Path, QPath, TyKind, UnOp};
1111
use rustc_lint::{LateContext, LintContext};
1212
use rustc_middle::ty::adjustment::Adjust;
1313
use rustc_middle::ty::{self, FloatTy, InferTy, Ty};
14-
use rustc_span::{Symbol, sym};
14+
use rustc_span::Symbol;
1515
use std::ops::ControlFlow;
1616

1717
use super::UNNECESSARY_CAST;

clippy_lints/src/collection_is_never_read.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
use clippy_utils::diagnostics::span_lint;
2-
use clippy_utils::get_enclosing_block;
2+
use clippy_utils::{get_enclosing_block, sym};
33
use clippy_utils::res::{MaybeDef, MaybeResPath};
44
use clippy_utils::visitors::{Visitable, for_each_expr};
55
use core::ops::ControlFlow;
66
use rustc_hir::{Body, ExprKind, HirId, LangItem, LetStmt, Node, PatKind};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::declare_lint_pass;
9-
use rustc_span::symbol::sym;
109

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

clippy_lints/src/create_dir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
2+
use clippy_utils::sym;
23
use rustc_errors::Applicability;
34
use rustc_hir::{Expr, ExprKind, QPath};
45
use rustc_lint::{LateContext, LateLintPass};
56
use rustc_session::declare_lint_pass;
6-
use rustc_span::sym;
77

88
declare_clippy_lint! {
99
/// ### What it does

clippy_lints/src/dbg_macro.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use clippy_config::Conf;
22
use clippy_utils::diagnostics::span_lint_and_then;
3-
use clippy_utils::is_in_test;
3+
use clippy_utils::{is_in_test, sym};
44
use clippy_utils::macros::{MacroCall, macro_backtrace};
55
use clippy_utils::source::snippet_with_applicability;
66
use rustc_data_structures::fx::FxHashSet;
77
use rustc_errors::Applicability;
88
use rustc_hir::{Arm, Closure, ClosureKind, CoroutineKind, Expr, ExprKind, LetStmt, LocalSource, Node, Stmt, StmtKind};
99
use rustc_lint::{LateContext, LateLintPass, LintContext};
1010
use rustc_session::impl_lint_pass;
11-
use rustc_span::{Span, SyntaxContext, sym};
11+
use rustc_span::{Span, SyntaxContext};
1212

1313
declare_clippy_lint! {
1414
/// ### What it does

clippy_lints/src/default_instead_of_iter_empty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::source::snippet_with_context;
3-
use clippy_utils::{last_path_segment, std_or_core};
3+
use clippy_utils::{last_path_segment, std_or_core, sym};
44
use rustc_errors::Applicability;
55
use rustc_hir::{Expr, ExprKind, GenericArg, QPath, TyKind, def};
66
use rustc_lint::{LateContext, LateLintPass};
77
use rustc_session::declare_lint_pass;
8-
use rustc_span::{SyntaxContext, sym};
8+
use rustc_span::SyntaxContext;
99

1010
declare_clippy_lint! {
1111
/// ### What it does

clippy_lints/src/dereference.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ use clippy_utils::res::MaybeResPath;
33
use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
44
use clippy_utils::sugg::has_enclosing_paren;
55
use clippy_utils::ty::{adjust_derefs_manually_drop, implements_trait, is_manually_drop, peel_and_count_ty_refs};
6-
use clippy_utils::{
7-
DefinedTy, ExprUseNode, expr_use_ctxt, get_parent_expr, is_block_like, is_from_proc_macro, is_lint_allowed,
8-
};
6+
use clippy_utils::{DefinedTy, ExprUseNode, expr_use_ctxt, get_parent_expr, is_block_like, is_from_proc_macro, is_lint_allowed, sym};
97
use rustc_ast::util::parser::ExprPrecedence;
108
use rustc_data_structures::fx::FxIndexMap;
119
use rustc_errors::Applicability;
@@ -19,7 +17,6 @@ use rustc_lint::{LateContext, LateLintPass};
1917
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};
2018
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, TypeckResults};
2119
use rustc_session::impl_lint_pass;
22-
use rustc_span::symbol::sym;
2320
use rustc_span::{Span, Symbol};
2421
use std::borrow::Cow;
2522

clippy_lints/src/derive/unsafe_derive_deserialize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use std::ops::ControlFlow;
22

33
use clippy_utils::diagnostics::span_lint_hir_and_then;
4-
use clippy_utils::{is_lint_allowed, paths};
4+
use clippy_utils::{is_lint_allowed, paths, sym};
55
use rustc_hir::def_id::LocalDefId;
66
use rustc_hir::intravisit::{FnKind, Visitor, walk_expr, walk_fn, walk_item};
77
use rustc_hir::{self as hir, BlockCheckMode, BodyId, Expr, ExprKind, FnDecl, HirId, Item, UnsafeSource};
88
use rustc_lint::LateContext;
99
use rustc_middle::hir::nested_filter;
1010
use rustc_middle::ty::{self, Ty};
11-
use rustc_span::{Span, sym};
11+
use rustc_span::Span;
1212

1313
use super::UNSAFE_DERIVE_DESERIALIZE;
1414

0 commit comments

Comments
 (0)