mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align Term methods with GenericArg methods

Browse Source
This commit is contained in:
Michael Goulet 2024-05-29 22:23:49 -04:00
parent e94779a396
commit 9f4a2dd147
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/methods/iter_on_single_or_empty_collections.rs
View File

@ -42,7 +42,7 @@ fn is_arg_ty_unified_in_fn<'tcx>(
cx.tcx.predicates_of(fn_id).predicates.iter().any(|(clause, _)| { cx.tcx.predicates_of(fn_id).predicates.iter().any(|(clause, _)| {
clause clause
.as_projection_clause() .as_projection_clause()
.and_then(|p| p.map_bound(|p| p.term.ty()).transpose()) .and_then(|p| p.map_bound(|p| p.term.as_type()).transpose())
.is_some_and(|ty| ty.skip_binder() == arg_ty_in_args) .is_some_and(|ty| ty.skip_binder() == arg_ty_in_args)
}) || fn_sig }) || fn_sig
.inputs() .inputs()

4
clippy_lints/src/needless_borrows_for_generic_args.rs
View File

@ -311,7 +311,7 @@ fn is_mixed_projection_predicate<'tcx>(
) -> bool { ) -> bool {
let generics = cx.tcx.generics_of(callee_def_id); let generics = cx.tcx.generics_of(callee_def_id);
// The predicate requires the projected type to equal a type parameter from the parent context. // The predicate requires the projected type to equal a type parameter from the parent context.
if let Some(term_ty) = projection_predicate.term.ty() if let Some(term_ty) = projection_predicate.term.as_type()
&& let ty::Param(term_param_ty) = term_ty.kind() && let ty::Param(term_param_ty) = term_ty.kind()
&& (term_param_ty.index as usize) < generics.parent_count && (term_param_ty.index as usize) < generics.parent_count
{ {
@ -370,7 +370,7 @@ fn replace_types<'tcx>(
if replaced.insert(param_ty.index) { if replaced.insert(param_ty.index) {
for projection_predicate in projection_predicates { for projection_predicate in projection_predicates {
if projection_predicate.projection_term.self_ty() == param_ty.to_ty(cx.tcx) if projection_predicate.projection_term.self_ty() == param_ty.to_ty(cx.tcx)
&& let Some(term_ty) = projection_predicate.term.ty() && let Some(term_ty) = projection_predicate.term.as_type()
&& let ty::Param(term_param_ty) = term_ty.kind() && let ty::Param(term_param_ty) = term_ty.kind()
{ {
let projection = projection_predicate let projection = projection_predicate

4
clippy_lints/src/unit_return_expecting_ord.rs
View File

@ -100,12 +100,12 @@ fn get_args_to_check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'tcx>) -> Ve
{ {
if ord_preds if ord_preds
.iter() .iter()
.any(|ord| Some(ord.self_ty()) == return_ty_pred.term.ty()) .any(|ord| Some(ord.self_ty()) == return_ty_pred.term.as_type())
{ {
args_to_check.push((i, "Ord".to_string())); args_to_check.push((i, "Ord".to_string()));
} else if partial_ord_preds } else if partial_ord_preds
.iter() .iter()
.any(|pord| pord.self_ty() == return_ty_pred.term.ty().unwrap()) .any(|pord| pord.self_ty() == return_ty_pred.term.expect_type())
{ {
args_to_check.push((i, "PartialOrd".to_string())); args_to_check.push((i, "PartialOrd".to_string()));
} }

6
clippy_utils/src/ty.rs
View File

@ -750,7 +750,7 @@ pub fn ty_sig<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<ExprFnSig<'t
let output = bounds let output = bounds
.projection_bounds() .projection_bounds()
.find(|p| lang_items.fn_once_output().map_or(false, |id| id == p.item_def_id())) .find(|p| lang_items.fn_once_output().map_or(false, |id| id == p.item_def_id()))
.map(|p| p.map_bound(|p| p.term.ty().unwrap())); .map(|p| p.map_bound(|p| p.term.expect_type()));
Some(ExprFnSig::Trait(bound.map_bound(|b| b.args.type_at(0)), output, None)) Some(ExprFnSig::Trait(bound.map_bound(|b| b.args.type_at(0)), output, None))
}, },
_ => None, _ => None,
@ -798,7 +798,7 @@ fn sig_from_bounds<'tcx>(
// Multiple different fn trait impls. Is this even allowed? // Multiple different fn trait impls. Is this even allowed?
return None; return None;
} }
output = Some(pred.kind().rebind(p.term.ty().unwrap())); output = Some(pred.kind().rebind(p.term.expect_type()));
}, },
_ => (), _ => (),
} }
@ -836,7 +836,7 @@ fn sig_for_projection<'tcx>(cx: &LateContext<'tcx>, ty: AliasTy<'tcx>) -> Option
// Multiple different fn trait impls. Is this even allowed? // Multiple different fn trait impls. Is this even allowed?
return None; return None;
} }
output = pred.kind().rebind(p.term.ty()).transpose(); output = pred.kind().rebind(p.term.as_type()).transpose();
}, },
_ => (), _ => (),
} }