Skip to content

Commit a6153e8

Browse files
lcnrlcnr
committed
get clippy to compile again
1 parent 260f17e commit a6153e8

File tree

8 files changed

+27
-63
lines changed

8 files changed

+27
-63
lines changed

‎compiler/rustc_middle/src/ty/sty.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,10 +1889,7 @@ impl<'tcx> Ty<'tcx> {
18891889

18901890
#[inline]
18911891
pub fn is_slice(self) -> bool {
1892-
match self.kind() {
1893-
RawPtr(TypeAndMut { ty, .. }) | Ref(_, ty, _) => matches!(ty.kind(), Slice(_) | Str),
1894-
_ => false,
1895-
}
1892+
matches!(self.kind(), Slice(_))
18961893
}
18971894

18981895
#[inline]

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use clippy_utils::{higher, peel_blocks_with_stmt, SpanlessEq};
33
use if_chain::if_chain;
44
use rustc_ast::ast::LitKind;
55
use rustc_errors::Applicability;
6-
use rustc_hir::{lang_items::LangItem, BinOpKind, Expr, ExprKind, QPath};
6+
use rustc_hir::{BinOpKind, Expr, ExprKind, QPath};
77
use rustc_lint::{LateContext, LateLintPass};
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99

@@ -82,14 +82,6 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
8282

8383
// Get the variable name
8484
let var_name = ares_path.segments[0].ident.name.as_str();
85-
const INT_TYPES: [LangItem; 5] = [
86-
LangItem::I8,
87-
LangItem::I16,
88-
LangItem::I32,
89-
LangItem::I64,
90-
LangItem::Isize
91-
];
92-
9385
match cond_num_val.kind {
9486
ExprKind::Lit(ref cond_lit) => {
9587
// Check if the constant is zero
@@ -105,8 +97,8 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
10597
if name.ident.as_str() == "MIN";
10698
if let Some(const_id) = cx.typeck_results().type_dependent_def_id(cond_num_val.hir_id);
10799
if let Some(impl_id) = cx.tcx.impl_of_method(const_id);
108-
let mut int_ids = INT_TYPES.iter().filter_map(|&ty| cx.tcx.lang_items().require(ty).ok());
109-
if int_ids.any(|int_id| int_id == impl_id);
100+
if let None = cx.tcx.impl_trait_ref(impl_id); // An inherent impl
101+
if cx.tcx.type_of(impl_id).is_integral();
110102
then {
111103
print_lint_and_sugg(cx, var_name, expr)
112104
}
@@ -118,8 +110,8 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitSaturatingSub {
118110
if name.ident.as_str() == "min_value";
119111
if let Some(func_id) = cx.typeck_results().type_dependent_def_id(func.hir_id);
120112
if let Some(impl_id) = cx.tcx.impl_of_method(func_id);
121-
let mut int_ids = INT_TYPES.iter().filter_map(|&ty| cx.tcx.lang_items().require(ty).ok());
122-
if int_ids.any(|int_id| int_id == impl_id);
113+
if let None = cx.tcx.impl_trait_ref(impl_id); // An inherent impl
114+
if cx.tcx.type_of(impl_id).is_integral();
123115
then {
124116
print_lint_and_sugg(cx, var_name, expr)
125117
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ pub fn is_clone_like(cx: &LateContext<'_>, method_name: &str, method_def_id: hir
4949
"to_owned" => is_diag_trait_item(cx, method_def_id, sym::ToOwned),
5050
"to_path_buf" => is_diag_item_method(cx, method_def_id, sym::Path),
5151
"to_vec" => {
52-
cx.tcx
53-
.impl_of_method(method_def_id)
54-
.map(|impl_did| Some(impl_did) == cx.tcx.lang_items().slice_alloc_impl())
55-
== Some(true)
52+
cx.tcx.impl_of_method(method_def_id)
53+
.filter(|&impl_did| {
54+
cx.tcx.type_of(impl_did).is_slice() && cx.tcx.impl_trait_ref(impl_did).is_none()
55+
})
56+
.is_some()
5657
},
5758
_ => false,
5859
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ pub(super) fn check(cx: &LateContext<'_>, method_name: &str, expr: &Expr<'_>, se
1212
if count <= 1;
1313
if let Some(call_id) = cx.typeck_results().type_dependent_def_id(expr.hir_id);
1414
if let Some(impl_id) = cx.tcx.impl_of_method(call_id);
15-
let lang_items = cx.tcx.lang_items();
16-
if lang_items.slice_impl() == Some(impl_id) || lang_items.str_impl() == Some(impl_id);
15+
if cx.tcx.impl_trait_ref(impl_id).is_none();
16+
let self_ty = cx.tcx.type_of(impl_id);
17+
if self_ty.is_slice() || self_ty.is_str();
1718
then {
1819
// Ignore empty slice and string literals when used with a literal count.
1920
if matches!(self_arg.kind, ExprKind::Array([]))
2021
|| matches!(self_arg.kind, ExprKind::Lit(Spanned { node: LitKind::Str(s, _), .. }) if s.is_empty())
21-
2222
{
2323
return;
2424
}
@@ -28,7 +28,7 @@ pub(super) fn check(cx: &LateContext<'_>, method_name: &str, expr: &Expr<'_>, se
2828
"the resulting iterator will always return `None`")
2929
} else {
3030
(format!("`{}` called with `1` split", method_name),
31-
if lang_items.slice_impl() == Some(impl_id) {
31+
if self_ty.is_slice() {
3232
"the resulting iterator will always return the entire slice followed by `None`"
3333
} else {
3434
"the resulting iterator will always return the entire string followed by `None`"

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_hir::{
1616
};
1717
use rustc_lint::{LateContext, LateLintPass};
1818
use rustc_middle::hir::nested_filter;
19-
use rustc_middle::ty::{self, AssocItems, AssocKind, Ty};
19+
use rustc_middle::ty::{self, Ty};
2020
use rustc_session::{declare_lint_pass, declare_tool_lint};
2121
use rustc_span::source_map::Span;
2222
use rustc_span::symbol::Symbol;
@@ -308,7 +308,6 @@ struct PtrArg<'tcx> {
308308
method_renames: &'static [(&'static str, &'static str)],
309309
ref_prefix: RefPrefix,
310310
deref_ty: DerefTy<'tcx>,
311-
deref_assoc_items: Option<(DefId, &'tcx AssocItems<'tcx>)>,
312311
}
313312
impl PtrArg<'_> {
314313
fn build_msg(&self) -> String {
@@ -411,7 +410,7 @@ fn check_fn_args<'cx, 'tcx: 'cx>(
411410
if params.get(i).map_or(true, |p| !is_lint_allowed(cx, PTR_ARG, p.hir_id));
412411

413412
then {
414-
let (method_renames, deref_ty, deref_impl_id) = match cx.tcx.get_diagnostic_name(adt.did()) {
413+
let (method_renames, deref_ty) = match cx.tcx.get_diagnostic_name(adt.did()) {
415414
Some(sym::Vec) => (
416415
[("clone", ".to_owned()")].as_slice(),
417416
DerefTy::Slice(
@@ -424,17 +423,14 @@ fn check_fn_args<'cx, 'tcx: 'cx>(
424423
}),
425424
substs.type_at(0),
426425
),
427-
cx.tcx.lang_items().slice_impl()
428426
),
429427
Some(sym::String) => (
430428
[("clone", ".to_owned()"), ("as_str", "")].as_slice(),
431429
DerefTy::Str,
432-
cx.tcx.lang_items().str_impl()
433430
),
434431
Some(sym::PathBuf) => (
435432
[("clone", ".to_path_buf()"), ("as_path", "")].as_slice(),
436433
DerefTy::Path,
437-
None,
438434
),
439435
Some(sym::Cow) if mutability == Mutability::Not => {
440436
let ty_name = name.args
@@ -470,7 +466,6 @@ fn check_fn_args<'cx, 'tcx: 'cx>(
470466
mutability,
471467
},
472468
deref_ty,
473-
deref_assoc_items: deref_impl_id.map(|id| (id, cx.tcx.associated_items(id))),
474469
});
475470
}
476471
}
@@ -607,14 +602,7 @@ fn check_ptr_arg_usage<'tcx>(cx: &LateContext<'tcx>, body: &'tcx Body<'_>, args:
607602
// If the types match check for methods which exist on both types. e.g. `Vec::len` and
608603
// `slice::len`
609604
ty::Adt(def, _)
610-
if def.did() == args.ty_did
611-
&& (i != 0
612-
|| self.cx.tcx.trait_of_item(id).is_some()
613-
|| !args.deref_assoc_items.map_or(false, |(id, items)| {
614-
items
615-
.find_by_name_and_kind(self.cx.tcx, name.ident, AssocKind::Fn, id)
616-
.is_some()
617-
})) =>
605+
if def.did() == args.ty_did =>
618606
{
619607
set_skip_flag();
620608
},

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ use rustc_hir::intravisit::{walk_expr, FnKind, Visitor};
7777
use rustc_hir::itemlikevisit::ItemLikeVisitor;
7878
use rustc_hir::LangItem::{OptionNone, ResultErr, ResultOk};
7979
use rustc_hir::{
80-
def, lang_items, Arm, ArrayLen, BindingAnnotation, Block, BlockCheckMode, Body, Constness, Destination, Expr,
80+
def, Arm, ArrayLen, BindingAnnotation, Block, BlockCheckMode, Body, Constness, Destination, Expr,
8181
ExprKind, FnDecl, ForeignItem, HirId, Impl, ImplItem, ImplItemKind, IsAsync, Item, ItemKind, LangItem, Local,
82-
MatchSource, Mutability, Node, Param, Pat, PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind, Target,
82+
MatchSource, Mutability, Node, Param, Pat, PatKind, Path, PathSegment, PrimTy, QPath, Stmt, StmtKind,
8383
TraitItem, TraitItemKind, TraitRef, TyKind, UnOp,
8484
};
8585
use rustc_lint::{LateContext, Level, Lint, LintContext};
@@ -479,12 +479,10 @@ pub fn def_path_res(cx: &LateContext<'_>, path: &[&str]) -> Res {
479479
_ => None,
480480
}
481481
}
482-
fn find_primitive(tcx: TyCtxt<'_>, name: &str) -> Option<DefId> {
483-
if let Some(&(index, Target::Impl)) = lang_items::ITEM_REFS.get(&Symbol::intern(name)) {
484-
tcx.lang_items().items()[index]
485-
} else {
486-
None
487-
}
482+
fn find_primitive(_tcx: TyCtxt<'_>, _name: &str) -> Option<DefId> {
483+
// FIXME: Deal with this without relying on lang items or by only
484+
// looking at a single impl.
485+
None
488486
}
489487
fn find_crate(tcx: TyCtxt<'_>, name: &str) -> Option<DefId> {
490488
tcx.crates(())

‎src/tools/clippy/tests/ui-toml/toml_disallowed_methods/conf_disallowed_methods.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ fn main() {
1010
let mut a = vec![1, 2, 3, 4];
1111
a.iter().sum::<i32>();
1212

13-
a.sort_unstable();
13+
a.sort_unstable(); // FIXME: Warn here
1414

15-
let _ = 2.0f32.clamp(3.0f32, 4.0f32);
15+
let _ = 2.0f32.clamp(3.0f32, 4.0f32); // FIXME: Warn here
1616
let _ = 2.0f64.clamp(3.0f64, 4.0f64);
1717
}

‎src/tools/clippy/tests/ui-toml/toml_disallowed_methods/conf_disallowed_methods.stderr‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,5 @@ error: use of a disallowed method `std::iter::Iterator::sum`
2020
LL | a.iter().sum::<i32>();
2121
| ^^^^^^^^^^^^^^^^^^^^^
2222

23-
error: use of a disallowed method `slice::sort_unstable`
24-
--> $DIR/conf_disallowed_methods.rs:13:5
25-
|
26-
LL | a.sort_unstable();
27-
| ^^^^^^^^^^^^^^^^^
28-
29-
error: use of a disallowed method `f32::clamp`
30-
--> $DIR/conf_disallowed_methods.rs:15:13
31-
|
32-
LL | let _ = 2.0f32.clamp(3.0f32, 4.0f32);
33-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
34-
35-
error: aborting due to 5 previous errors
23+
error: aborting due to 3 previous errors
3624

0 commit comments

Comments
 (0)