Skip to content

Commit 1ec3ef7

Browse files
compiler-errorscompiler-errors
committed
Yeet PolyGenSig
1 parent f32d298 commit 1ec3ef7

File tree

6 files changed

+65
-85
lines changed

6 files changed

+65
-85
lines changed

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ pub use self::sty::{
9898
CoroutineArgs, CoroutineArgsParts, EarlyParamRegion, ExistentialPredicate,
9999
ExistentialProjection, ExistentialTraitRef, FnSig, GenSig, InlineConstArgs,
100100
InlineConstArgsParts, LateParamRegion, ParamConst, ParamTy, PolyExistentialPredicate,
101-
PolyExistentialProjection, PolyExistentialTraitRef, PolyFnSig, PolyGenSig, PolyTraitRef,
102-
PredicateKind, Region, RegionKind, RegionVid, TraitRef, TyKind, TypeAndMut, UpvarArgs,
103-
VarianceDiagInfo,
101+
PolyExistentialProjection, PolyExistentialTraitRef, PolyFnSig, PolyTraitRef, PredicateKind,
102+
Region, RegionKind, RegionVid, TraitRef, TyKind, TypeAndMut, UpvarArgs, VarianceDiagInfo,
104103
};
105104
pub use self::trait_def::TraitDef;
106105
pub use self::typeck_results::{

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

-12
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,6 @@ impl<'tcx> CoroutineArgs<'tcx> {
468468
self.split().return_ty.expect_ty()
469469
}
470470

471-
/// Returns the "coroutine signature", which consists of its yield
472-
/// and return types.
473-
///
474-
/// N.B., some bits of the code prefers to see this wrapped in a
475-
/// binder, but it never contains bound regions. Probably this
476-
/// function should be removed.
477-
pub fn poly_sig(self) -> PolyGenSig<'tcx> {
478-
ty::Binder::dummy(self.sig())
479-
}
480-
481471
/// Returns the "coroutine signature", which consists of its resume, yield
482472
/// and return types.
483473
pub fn sig(self) -> GenSig<'tcx> {
@@ -1352,8 +1342,6 @@ pub struct GenSig<'tcx> {
13521342
pub return_ty: Ty<'tcx>,
13531343
}
13541344

1355-
pub type PolyGenSig<'tcx> = Binder<'tcx, GenSig<'tcx>>;
1356-
13571345
/// Signature of a function type, which we have arbitrarily
13581346
/// decided to use to refer to the input/output types.
13591347
///

‎compiler/rustc_trait_selection/src/traits/project.rs

+37-40
Original file line numberDiff line numberDiff line change
@@ -2076,7 +2076,7 @@ fn confirm_coroutine_candidate<'cx, 'tcx>(
20762076
else {
20772077
unreachable!()
20782078
};
2079-
let coroutine_sig = args.as_coroutine().poly_sig();
2079+
let coroutine_sig = args.as_coroutine().sig();
20802080
let Normalized { value: coroutine_sig, obligations } = normalize_with_depth(
20812081
selcx,
20822082
obligation.param_env,
@@ -2091,29 +2091,28 @@ fn confirm_coroutine_candidate<'cx, 'tcx>(
20912091

20922092
let coroutine_def_id = tcx.require_lang_item(LangItem::Coroutine, None);
20932093

2094-
let predicate = super::util::coroutine_trait_ref_and_outputs(
2094+
let (trait_ref, yield_ty, return_ty) = super::util::coroutine_trait_ref_and_outputs(
20952095
tcx,
20962096
coroutine_def_id,
20972097
obligation.predicate.self_ty(),
20982098
coroutine_sig,
2099-
)
2100-
.map_bound(|(trait_ref, yield_ty, return_ty)| {
2101-
let name = tcx.associated_item(obligation.predicate.def_id).name;
2102-
let ty = if name == sym::Return {
2103-
return_ty
2104-
} else if name == sym::Yield {
2105-
yield_ty
2106-
} else {
2107-
bug!()
2108-
};
2099+
);
21092100

2110-
ty::ProjectionPredicate {
2111-
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2112-
term: ty.into(),
2113-
}
2114-
});
2101+
let name = tcx.associated_item(obligation.predicate.def_id).name;
2102+
let ty = if name == sym::Return {
2103+
return_ty
2104+
} else if name == sym::Yield {
2105+
yield_ty
2106+
} else {
2107+
bug!()
2108+
};
2109+
2110+
let predicate = ty::ProjectionPredicate {
2111+
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2112+
term: ty.into(),
2113+
};
21152114

2116-
confirm_param_env_candidate(selcx, obligation, predicate, false)
2115+
confirm_param_env_candidate(selcx, obligation, ty::Binder::dummy(predicate), false)
21172116
.with_addl_obligations(nested)
21182117
.with_addl_obligations(obligations)
21192118
}
@@ -2128,7 +2127,7 @@ fn confirm_future_candidate<'cx, 'tcx>(
21282127
else {
21292128
unreachable!()
21302129
};
2131-
let coroutine_sig = args.as_coroutine().poly_sig();
2130+
let coroutine_sig = args.as_coroutine().sig();
21322131
let Normalized { value: coroutine_sig, obligations } = normalize_with_depth(
21332132
selcx,
21342133
obligation.param_env,
@@ -2142,22 +2141,21 @@ fn confirm_future_candidate<'cx, 'tcx>(
21422141
let tcx = selcx.tcx();
21432142
let fut_def_id = tcx.require_lang_item(LangItem::Future, None);
21442143

2145-
let predicate = super::util::future_trait_ref_and_outputs(
2144+
let (trait_ref, return_ty) = super::util::future_trait_ref_and_outputs(
21462145
tcx,
21472146
fut_def_id,
21482147
obligation.predicate.self_ty(),
21492148
coroutine_sig,
2150-
)
2151-
.map_bound(|(trait_ref, return_ty)| {
2152-
debug_assert_eq!(tcx.associated_item(obligation.predicate.def_id).name, sym::Output);
2149+
);
21532150

2154-
ty::ProjectionPredicate {
2155-
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2156-
term: return_ty.into(),
2157-
}
2158-
});
2151+
debug_assert_eq!(tcx.associated_item(obligation.predicate.def_id).name, sym::Output);
2152+
2153+
let predicate = ty::ProjectionPredicate {
2154+
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2155+
term: return_ty.into(),
2156+
};
21592157

2160-
confirm_param_env_candidate(selcx, obligation, predicate, false)
2158+
confirm_param_env_candidate(selcx, obligation, ty::Binder::dummy(predicate), false)
21612159
.with_addl_obligations(nested)
21622160
.with_addl_obligations(obligations)
21632161
}
@@ -2172,7 +2170,7 @@ fn confirm_iterator_candidate<'cx, 'tcx>(
21722170
else {
21732171
unreachable!()
21742172
};
2175-
let gen_sig = args.as_coroutine().poly_sig();
2173+
let gen_sig = args.as_coroutine().sig();
21762174
let Normalized { value: gen_sig, obligations } = normalize_with_depth(
21772175
selcx,
21782176
obligation.param_env,
@@ -2186,22 +2184,21 @@ fn confirm_iterator_candidate<'cx, 'tcx>(
21862184
let tcx = selcx.tcx();
21872185
let iter_def_id = tcx.require_lang_item(LangItem::Iterator, None);
21882186

2189-
let predicate = super::util::iterator_trait_ref_and_outputs(
2187+
let (trait_ref, yield_ty) = super::util::iterator_trait_ref_and_outputs(
21902188
tcx,
21912189
iter_def_id,
21922190
obligation.predicate.self_ty(),
21932191
gen_sig,
2194-
)
2195-
.map_bound(|(trait_ref, yield_ty)| {
2196-
debug_assert_eq!(tcx.associated_item(obligation.predicate.def_id).name, sym::Item);
2192+
);
21972193

2198-
ty::ProjectionPredicate {
2199-
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2200-
term: yield_ty.into(),
2201-
}
2202-
});
2194+
debug_assert_eq!(tcx.associated_item(obligation.predicate.def_id).name, sym::Item);
22032195

2204-
confirm_param_env_candidate(selcx, obligation, predicate, false)
2196+
let predicate = ty::ProjectionPredicate {
2197+
projection_ty: ty::AliasTy::new(tcx, obligation.predicate.def_id, trait_ref.args),
2198+
term: yield_ty.into(),
2199+
};
2200+
2201+
confirm_param_env_candidate(selcx, obligation, ty::Binder::dummy(predicate), false)
22052202
.with_addl_obligations(nested)
22062203
.with_addl_obligations(obligations)
22072204
}

‎compiler/rustc_trait_selection/src/traits/select/confirmation.rs

+12-15
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
731731

732732
debug!(?obligation, ?coroutine_def_id, ?args, "confirm_coroutine_candidate");
733733

734-
let coroutine_sig = args.as_coroutine().poly_sig();
734+
let coroutine_sig = args.as_coroutine().sig();
735735

736736
// NOTE: The self-type is a coroutine type and hence is
737737
// in fact unparameterized (or at least does not reference any
@@ -742,15 +742,14 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
742742
.no_bound_vars()
743743
.expect("unboxed closure type should not capture bound vars from the predicate");
744744

745-
let trait_ref = super::util::coroutine_trait_ref_and_outputs(
745+
let (trait_ref, _, _) = super::util::coroutine_trait_ref_and_outputs(
746746
self.tcx(),
747747
obligation.predicate.def_id(),
748748
self_ty,
749749
coroutine_sig,
750-
)
751-
.map_bound(|(trait_ref, ..)| trait_ref);
750+
);
752751

753-
let nested = self.confirm_poly_trait_refs(obligation, trait_ref)?;
752+
let nested = self.confirm_poly_trait_refs(obligation, ty::Binder::dummy(trait_ref))?;
754753
debug!(?trait_ref, ?nested, "coroutine candidate obligations");
755754

756755
Ok(nested)
@@ -770,17 +769,16 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
770769

771770
debug!(?obligation, ?coroutine_def_id, ?args, "confirm_future_candidate");
772771

773-
let coroutine_sig = args.as_coroutine().poly_sig();
772+
let coroutine_sig = args.as_coroutine().sig();
774773

775-
let trait_ref = super::util::future_trait_ref_and_outputs(
774+
let (trait_ref, _) = super::util::future_trait_ref_and_outputs(
776775
self.tcx(),
777776
obligation.predicate.def_id(),
778777
obligation.predicate.no_bound_vars().expect("future has no bound vars").self_ty(),
779778
coroutine_sig,
780-
)
781-
.map_bound(|(trait_ref, ..)| trait_ref);
779+
);
782780

783-
let nested = self.confirm_poly_trait_refs(obligation, trait_ref)?;
781+
let nested = self.confirm_poly_trait_refs(obligation, ty::Binder::dummy(trait_ref))?;
784782
debug!(?trait_ref, ?nested, "future candidate obligations");
785783

786784
Ok(nested)
@@ -800,17 +798,16 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
800798

801799
debug!(?obligation, ?coroutine_def_id, ?args, "confirm_iterator_candidate");
802800

803-
let gen_sig = args.as_coroutine().poly_sig();
801+
let gen_sig = args.as_coroutine().sig();
804802

805-
let trait_ref = super::util::iterator_trait_ref_and_outputs(
803+
let (trait_ref, _) = super::util::iterator_trait_ref_and_outputs(
806804
self.tcx(),
807805
obligation.predicate.def_id(),
808806
obligation.predicate.no_bound_vars().expect("iterator has no bound vars").self_ty(),
809807
gen_sig,
810-
)
811-
.map_bound(|(trait_ref, ..)| trait_ref);
808+
);
812809

813-
let nested = self.confirm_poly_trait_refs(obligation, trait_ref)?;
810+
let nested = self.confirm_poly_trait_refs(obligation, ty::Binder::dummy(trait_ref))?;
814811
debug!(?trait_ref, ?nested, "iterator candidate obligations");
815812

816813
Ok(nested)

‎compiler/rustc_trait_selection/src/traits/util.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -279,33 +279,33 @@ pub fn coroutine_trait_ref_and_outputs<'tcx>(
279279
tcx: TyCtxt<'tcx>,
280280
fn_trait_def_id: DefId,
281281
self_ty: Ty<'tcx>,
282-
sig: ty::PolyGenSig<'tcx>,
283-
) -> ty::Binder<'tcx, (ty::TraitRef<'tcx>, Ty<'tcx>, Ty<'tcx>)> {
282+
sig: ty::GenSig<'tcx>,
283+
) -> (ty::TraitRef<'tcx>, Ty<'tcx>, Ty<'tcx>) {
284284
assert!(!self_ty.has_escaping_bound_vars());
285-
let trait_ref = ty::TraitRef::new(tcx, fn_trait_def_id, [self_ty, sig.skip_binder().resume_ty]);
286-
sig.map_bound(|sig| (trait_ref, sig.yield_ty, sig.return_ty))
285+
let trait_ref = ty::TraitRef::new(tcx, fn_trait_def_id, [self_ty, sig.resume_ty]);
286+
(trait_ref, sig.yield_ty, sig.return_ty)
287287
}
288288

289289
pub fn future_trait_ref_and_outputs<'tcx>(
290290
tcx: TyCtxt<'tcx>,
291291
fn_trait_def_id: DefId,
292292
self_ty: Ty<'tcx>,
293-
sig: ty::PolyGenSig<'tcx>,
294-
) -> ty::Binder<'tcx, (ty::TraitRef<'tcx>, Ty<'tcx>)> {
293+
sig: ty::GenSig<'tcx>,
294+
) -> (ty::TraitRef<'tcx>, Ty<'tcx>) {
295295
assert!(!self_ty.has_escaping_bound_vars());
296296
let trait_ref = ty::TraitRef::new(tcx, fn_trait_def_id, [self_ty]);
297-
sig.map_bound(|sig| (trait_ref, sig.return_ty))
297+
(trait_ref, sig.return_ty)
298298
}
299299

300300
pub fn iterator_trait_ref_and_outputs<'tcx>(
301301
tcx: TyCtxt<'tcx>,
302302
iterator_def_id: DefId,
303303
self_ty: Ty<'tcx>,
304-
sig: ty::PolyGenSig<'tcx>,
305-
) -> ty::Binder<'tcx, (ty::TraitRef<'tcx>, Ty<'tcx>)> {
304+
sig: ty::GenSig<'tcx>,
305+
) -> (ty::TraitRef<'tcx>, Ty<'tcx>) {
306306
assert!(!self_ty.has_escaping_bound_vars());
307307
let trait_ref = ty::TraitRef::new(tcx, iterator_def_id, [self_ty]);
308-
sig.map_bound(|sig| (trait_ref, sig.yield_ty))
308+
(trait_ref, sig.yield_ty)
309309
}
310310

311311
pub fn impl_item_is_final(tcx: TyCtxt<'_>, assoc_item: &ty::AssocItem) -> bool {

‎compiler/rustc_ty_utils/src/abi.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ fn fn_sig_for_fn_abi<'tcx>(
9999
}
100100
ty::Coroutine(did, args, _) => {
101101
let coroutine_kind = tcx.coroutine_kind(did).unwrap();
102-
let sig = args.as_coroutine().poly_sig();
102+
let sig = args.as_coroutine().sig();
103103

104-
let bound_vars = tcx.mk_bound_variable_kinds_from_iter(
105-
sig.bound_vars().iter().chain(iter::once(ty::BoundVariableKind::Region(ty::BrEnv))),
106-
);
104+
let bound_vars = tcx.mk_bound_variable_kinds_from_iter(iter::once(
105+
ty::BoundVariableKind::Region(ty::BrEnv),
106+
));
107107
let br = ty::BoundRegion {
108108
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
109109
kind: ty::BoundRegionKind::BrEnv,
@@ -124,7 +124,6 @@ fn fn_sig_for_fn_abi<'tcx>(
124124
}
125125
};
126126

127-
let sig = sig.skip_binder();
128127
// The `FnSig` and the `ret_ty` here is for a coroutines main
129128
// `Coroutine::resume(...) -> CoroutineState` function in case we
130129
// have an ordinary coroutine, the `Future::poll(...) -> Poll`

0 commit comments

Comments
 (0)