Skip to content

Commit 4a6e67e

Browse files
camsteffencamsteffen
committed
Add missing diagnostic item Symbols
1 parent 3da2dd3 commit 4a6e67e

File tree

8 files changed

+22
-17
lines changed

8 files changed

+22
-17
lines changed

‎compiler/rustc_span/src/symbol.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,8 @@ symbols! {
592592
gt,
593593
half_open_range_patterns,
594594
hash,
595+
hashmap_type,
596+
hashset_type,
595597
hexagon_target_feature,
596598
hidden,
597599
homogeneous_aggregate,

‎src/tools/clippy/clippy_lints/src/entry.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ use rustc_lint::{LateContext, LateLintPass};
99
use rustc_middle::hir::map::Map;
1010
use rustc_session::{declare_lint_pass, declare_tool_lint};
1111
use rustc_span::source_map::Span;
12+
use rustc_span::sym;
1213

1314
declare_clippy_lint! {
1415
/// **What it does:** Checks for uses of `contains_key` + `insert` on `HashMap`
@@ -111,7 +112,7 @@ fn check_cond<'a>(cx: &LateContext<'_>, check: &'a Expr<'a>) -> Option<(&'static
111112
return if match_type(cx, obj_ty, &paths::BTREEMAP) {
112113
Some(("BTreeMap", map, key))
113114
}
114-
else if is_type_diagnostic_item(cx, obj_ty, sym!(hashmap_type)) {
115+
else if is_type_diagnostic_item(cx, obj_ty, sym::hashmap_type) {
115116
Some(("HashMap", map, key))
116117
}
117118
else {

‎src/tools/clippy/clippy_lints/src/loops.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ fn is_slice_like<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'_>) -> bool {
10101010
_ => false,
10111011
};
10121012

1013-
is_slice || is_type_diagnostic_item(cx, ty, sym::vec_type) || is_type_diagnostic_item(cx, ty, sym!(vecdeque_type))
1013+
is_slice || is_type_diagnostic_item(cx, ty, sym::vec_type) || is_type_diagnostic_item(cx, ty, sym::vecdeque_type)
10141014
}
10151015

10161016
fn fetch_cloned_expr<'tcx>(expr: &'tcx Expr<'tcx>) -> &'tcx Expr<'tcx> {
@@ -1908,7 +1908,7 @@ fn check_for_loop_over_map_kv<'tcx>(
19081908
_ => arg,
19091909
};
19101910

1911-
if is_type_diagnostic_item(cx, ty, sym!(hashmap_type)) || match_type(cx, ty, &paths::BTREEMAP) {
1911+
if is_type_diagnostic_item(cx, ty, sym::hashmap_type) || match_type(cx, ty, &paths::BTREEMAP) {
19121912
span_lint_and_then(
19131913
cx,
19141914
FOR_KV_MAP,
@@ -2386,9 +2386,9 @@ fn is_ref_iterable_type(cx: &LateContext<'_>, e: &Expr<'_>) -> bool {
23862386
is_iterable_array(ty, cx) ||
23872387
is_type_diagnostic_item(cx, ty, sym::vec_type) ||
23882388
match_type(cx, ty, &paths::LINKED_LIST) ||
2389-
is_type_diagnostic_item(cx, ty, sym!(hashmap_type)) ||
2390-
is_type_diagnostic_item(cx, ty, sym!(hashset_type)) ||
2391-
is_type_diagnostic_item(cx, ty, sym!(vecdeque_type)) ||
2389+
is_type_diagnostic_item(cx, ty, sym::hashmap_type) ||
2390+
is_type_diagnostic_item(cx, ty, sym::hashset_type) ||
2391+
is_type_diagnostic_item(cx, ty, sym::vecdeque_type) ||
23922392
match_type(cx, ty, &paths::BINARY_HEAP) ||
23932393
match_type(cx, ty, &paths::BTREEMAP) ||
23942394
match_type(cx, ty, &paths::BTREESET)
@@ -2922,9 +2922,9 @@ fn check_needless_collect_direct_usage<'tcx>(expr: &'tcx Expr<'_>, cx: &LateCont
29222922
then {
29232923
let ty = cx.typeck_results().node_type(ty.hir_id);
29242924
if is_type_diagnostic_item(cx, ty, sym::vec_type) ||
2925-
is_type_diagnostic_item(cx, ty, sym!(vecdeque_type)) ||
2925+
is_type_diagnostic_item(cx, ty, sym::vecdeque_type) ||
29262926
match_type(cx, ty, &paths::BTREEMAP) ||
2927-
is_type_diagnostic_item(cx, ty, sym!(hashmap_type)) {
2927+
is_type_diagnostic_item(cx, ty, sym::hashmap_type) {
29282928
if method.ident.name == sym!(len) {
29292929
let span = shorten_needless_collect_span(expr);
29302930
span_lint_and_sugg(
@@ -2992,7 +2992,7 @@ fn check_needless_collect_indirect_usage<'tcx>(expr: &'tcx Expr<'_>, cx: &LateCo
29922992
if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0);
29932993
if let ty = cx.typeck_results().node_type(ty.hir_id);
29942994
if is_type_diagnostic_item(cx, ty, sym::vec_type) ||
2995-
is_type_diagnostic_item(cx, ty, sym!(vecdeque_type)) ||
2995+
is_type_diagnostic_item(cx, ty, sym::vecdeque_type) ||
29962996
match_type(cx, ty, &paths::LINKED_LIST);
29972997
if let Some(iter_calls) = detect_iter_and_into_iters(block, *ident);
29982998
if iter_calls.len() == 1;

‎src/tools/clippy/clippy_lints/src/methods/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ fn lint_iter_nth<'tcx>(
25982598
"slice"
25992599
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&iter_args[0]), sym::vec_type) {
26002600
"Vec"
2601-
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&iter_args[0]), sym!(vecdeque_type)) {
2601+
} else if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(&iter_args[0]), sym::vecdeque_type) {
26022602
"VecDeque"
26032603
} else {
26042604
let nth_args = nth_and_iter_args[0];
@@ -2652,10 +2652,10 @@ fn lint_get_unwrap<'tcx>(cx: &LateContext<'tcx>, expr: &hir::Expr<'_>, get_args:
26522652
} else if is_type_diagnostic_item(cx, expr_ty, sym::vec_type) {
26532653
needs_ref = get_args_str.parse::<usize>().is_ok();
26542654
"Vec"
2655-
} else if is_type_diagnostic_item(cx, expr_ty, sym!(vecdeque_type)) {
2655+
} else if is_type_diagnostic_item(cx, expr_ty, sym::vecdeque_type) {
26562656
needs_ref = get_args_str.parse::<usize>().is_ok();
26572657
"VecDeque"
2658-
} else if !is_mut && is_type_diagnostic_item(cx, expr_ty, sym!(hashmap_type)) {
2658+
} else if !is_mut && is_type_diagnostic_item(cx, expr_ty, sym::hashmap_type) {
26592659
needs_ref = true;
26602660
"HashMap"
26612661
} else if !is_mut && match_type(cx, expr_ty, &paths::BTREEMAP) {

‎src/tools/clippy/clippy_lints/src/swap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fn check_for_slice<'a>(cx: &LateContext<'_>, lhs1: &'a Expr<'_>, lhs2: &'a Expr<
199199
if matches!(ty.kind(), ty::Slice(_))
200200
|| matches!(ty.kind(), ty::Array(_, _))
201201
|| is_type_diagnostic_item(cx, ty, sym::vec_type)
202-
|| is_type_diagnostic_item(cx, ty, sym!(vecdeque_type))
202+
|| is_type_diagnostic_item(cx, ty, sym::vecdeque_type)
203203
{
204204
return Slice::Swappable(lhs1, idx1, idx2);
205205
}

‎src/tools/clippy/clippy_lints/src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,14 +2680,14 @@ impl<'tcx> ImplicitHasherType<'tcx> {
26802680

26812681
let ty = hir_ty_to_ty(cx.tcx, hir_ty);
26822682

2683-
if is_type_diagnostic_item(cx, ty, sym!(hashmap_type)) && params_len == 2 {
2683+
if is_type_diagnostic_item(cx, ty, sym::hashmap_type) && params_len == 2 {
26842684
Some(ImplicitHasherType::HashMap(
26852685
hir_ty.span,
26862686
ty,
26872687
snippet(cx, params[0].span, "K"),
26882688
snippet(cx, params[1].span, "V"),
26892689
))
2690-
} else if is_type_diagnostic_item(cx, ty, sym!(hashset_type)) && params_len == 1 {
2690+
} else if is_type_diagnostic_item(cx, ty, sym::hashset_type) && params_len == 1 {
26912691
Some(ImplicitHasherType::HashSet(
26922692
hir_ty.span,
26932693
ty,

‎src/tools/clippy/clippy_lints/src/zero_sized_map_values.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use rustc_middle::ty::{Adt, Ty};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
66
use rustc_target::abi::LayoutOf as _;
77
use rustc_typeck::hir_ty_to_ty;
8+
use rustc_span::sym;
89

910
use crate::utils::{is_normalizable, is_type_diagnostic_item, match_type, paths, span_lint_and_help};
1011

@@ -47,7 +48,7 @@ impl LateLintPass<'_> for ZeroSizedMapValues {
4748
if !hir_ty.span.from_expansion();
4849
if !in_trait_impl(cx, hir_ty.hir_id);
4950
let ty = ty_from_hir_ty(cx, hir_ty);
50-
if is_type_diagnostic_item(cx, ty, sym!(hashmap_type)) || match_type(cx, ty, &paths::BTREEMAP);
51+
if is_type_diagnostic_item(cx, ty, sym::hashmap_type) || match_type(cx, ty, &paths::BTREEMAP);
5152
if let Adt(_, ref substs) = ty.kind();
5253
let ty = substs.type_at(1);
5354
// Do this to prevent `layout_of` crashing, being unable to fully normalize `ty`.

‎src/tools/clippy/clippy_utils/src/eager_or_lazy.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ use rustc_hir::intravisit::{NestedVisitorMap, Visitor};
1818
use rustc_hir::{Block, Expr, ExprKind, Path, QPath};
1919
use rustc_lint::LateContext;
2020
use rustc_middle::hir::map::Map;
21+
use rustc_span::sym;
2122

2223
/// Is the expr pure (is it free from side-effects)?
2324
/// This function is named so to stress that it isn't exhaustive and returns FNs.
@@ -99,7 +100,7 @@ fn identify_some_potentially_expensive_patterns<'tcx>(cx: &LateContext<'tcx>, ex
99100
ExprKind::Call(..) => !is_ctor_or_promotable_const_function(self.cx, expr),
100101
ExprKind::Index(obj, _) => {
101102
let ty = self.cx.typeck_results().expr_ty(obj);
102-
is_type_diagnostic_item(self.cx, ty, sym!(hashmap_type))
103+
is_type_diagnostic_item(self.cx, ty, sym::hashmap_type)
103104
|| match_type(self.cx, ty, &paths::BTREEMAP)
104105
},
105106
ExprKind::MethodCall(..) => true,

0 commit comments

Comments
 (0)