Auto merge of #131988 - matthiaskrgr:rollup-tx173wn, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #126588 (Added more scenarios where comma to be removed in the function arg) - #131728 (bootstrap: extract builder cargo to its own module) - #131968 (Rip out old effects var handling code from traits) - #131981 (Remove the `BoundConstness::NotConst` variant) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
1d0dad5eb3
@ -190,15 +190,6 @@ fn is_same_generics<'tcx>(
|
|||||||
.enumerate()
|
.enumerate()
|
||||||
.skip(1) // skip `Self` implicit arg
|
.skip(1) // skip `Self` implicit arg
|
||||||
.all(|(arg_index, arg)| {
|
.all(|(arg_index, arg)| {
|
||||||
if [
|
|
||||||
implied_by_generics.host_effect_index,
|
|
||||||
implied_generics.host_effect_index,
|
|
||||||
]
|
|
||||||
.contains(&Some(arg_index))
|
|
||||||
{
|
|
||||||
// skip host effect params in determining whether generics are same
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if let Some(ty) = arg.as_type() {
|
if let Some(ty) = arg.as_type() {
|
||||||
if let &ty::Param(ty::ParamTy { index, .. }) = ty.kind()
|
if let &ty::Param(ty::ParamTy { index, .. }) = ty.kind()
|
||||||
// `index == 0` means that it's referring to `Self`,
|
// `index == 0` means that it's referring to `Self`,
|
||||||
|
@ -274,23 +274,10 @@ pub fn implements_trait_with_env_from_iter<'tcx>(
|
|||||||
.map(|arg| arg.into().unwrap_or_else(|| infcx.next_ty_var(DUMMY_SP).into()))
|
.map(|arg| arg.into().unwrap_or_else(|| infcx.next_ty_var(DUMMY_SP).into()))
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
// If an effect arg was not specified, we need to specify it.
|
|
||||||
let effect_arg = if tcx
|
|
||||||
.generics_of(trait_id)
|
|
||||||
.host_effect_index
|
|
||||||
.is_some_and(|x| args.get(x - 1).is_none())
|
|
||||||
{
|
|
||||||
Some(GenericArg::from(callee_id.map_or(tcx.consts.true_, |def_id| {
|
|
||||||
tcx.expected_host_effect_param_for_body(def_id)
|
|
||||||
})))
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
let trait_ref = TraitRef::new(
|
let trait_ref = TraitRef::new(
|
||||||
tcx,
|
tcx,
|
||||||
trait_id,
|
trait_id,
|
||||||
[GenericArg::from(ty)].into_iter().chain(args).chain(effect_arg),
|
[GenericArg::from(ty)].into_iter().chain(args),
|
||||||
);
|
);
|
||||||
|
|
||||||
debug_assert_matches!(
|
debug_assert_matches!(
|
||||||
|
Loading…
Reference in New Issue
Block a user