Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 560c6cc

Browse files
Fix clippy
1 parent 127e42d commit 560c6cc

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_lint::{LateContext, LateLintPass};
1111
use rustc_middle::hir::nested_filter;
1212
use rustc_middle::traits::Reveal;
1313
use rustc_middle::ty::{
14-
self, ClauseKind, GenericArgKind, GenericParamDefKind, ImplPolarity,ParamEnv, ToPredicate, TraitPredicate, Ty,
14+
self, ClauseKind, GenericArgKind, GenericParamDefKind, ParamEnv, ToPredicate, TraitPredicate, Ty,
1515
TyCtxt,
1616
};
1717
use rustc_session::declare_lint_pass;
@@ -502,7 +502,7 @@ fn param_env_for_derived_eq(tcx: TyCtxt<'_>, did: DefId, eq_trait_id: DefId) ->
502502
params.iter().filter(|&&(_, needs_eq)| needs_eq).map(|&(param, _)| {
503503
ClauseKind::Trait(TraitPredicate {
504504
trait_ref: ty::TraitRef::new(tcx, eq_trait_id, [tcx.mk_param_from_def(param)]),
505-
polarity: ImplPolarity::Positive,
505+
polarity: ty::PredicatePolarity::Positive,
506506
})
507507
.to_predicate(tcx)
508508
}),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_hir::{BindingAnnotation, Expr, ExprKind, FnRetTy, Param, PatKind, QPat
99
use rustc_infer::infer::TyCtxtInferExt;
1010
use rustc_lint::{LateContext, LateLintPass};
1111
use rustc_middle::ty::{
12-
self, Binder, ClosureArgs, ClosureKind, FnSig, GenericArg, GenericArgKind, ImplPolarity,List, Region, RegionKind,
12+
self, Binder, ClosureArgs, ClosureKind, FnSig, GenericArg, GenericArgKind, List, Region, RegionKind,
1313
Ty, TypeVisitableExt, TypeckResults,
1414
};
1515
use rustc_session::declare_lint_pass;
@@ -173,7 +173,7 @@ impl<'tcx> LateLintPass<'tcx> for EtaReduction {
173173
if let Ok((ClosureKind::FnMut, _)) = cx.tcx.infer_ctxt().build().type_implements_fn_trait(
174174
cx.param_env,
175175
Binder::bind_with_vars(callee_ty_adjusted, List::empty()),
176-
ImplPolarity::Positive,
176+
ty::PredicatePolarity::Positive,
177177
) && path_to_local(callee).map_or(false, |l| {
178178
local_used_in(cx, l, args) || local_used_after_expr(cx, l, expr)
179179
}) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use rustc_lint::LateContext;
1818
use rustc_middle::mir::Mutability;
1919
use rustc_middle::ty::adjustment::{Adjust, Adjustment, OverloadedDeref};
2020
use rustc_middle::ty::{
21-
self, ClauseKind, GenericArg, GenericArgKind, GenericArgsRef, ImplPolarity,ParamTy, ProjectionPredicate,
21+
self, ClauseKind, GenericArg, GenericArgKind, GenericArgsRef, ParamTy, ProjectionPredicate,
2222
TraitPredicate, Ty,
2323
};
2424
use rustc_span::{sym, Symbol};
@@ -669,7 +669,7 @@ fn check_borrow_predicate<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) {
669669
&& let Some(borrow_id) = cx.tcx.get_diagnostic_item(sym::Borrow)
670670
&& cx.tcx.predicates_of(method_def_id).predicates.iter().any(|(pred, _)| {
671671
if let ClauseKind::Trait(trait_pred) = pred.kind().skip_binder()
672-
&& trait_pred.polarity == ImplPolarity::Positive
672+
&& trait_pred.polarity == ty::PredicatePolarity::Positive
673673
&& trait_pred.trait_ref.def_id == borrow_id
674674
{
675675
true

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /