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

Give the field in FnSigTys a name.

Browse Source
This commit is contained in:
Nicholas Nethercote 2024-08-12 15:51:04 +10:00
parent f4a3ed0243
commit b9f3db6adb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_type_ir/src/fast_reject.rs
View File

@ -311,8 +311,8 @@ pub fn types_may_unify(self, obligation_ty: I::Ty, impl_ty: I::Ty) -> bool {
}
ty::FnPtr(obl_sig_tys, obl_hdr) => match k {
ty::FnPtr(impl_sig_tys, impl_hdr) => {
let obl_sig_tys = obl_sig_tys.skip_binder().0;
let impl_sig_tys = impl_sig_tys.skip_binder().0;
let obl_sig_tys = obl_sig_tys.skip_binder().inputs_and_output;
let impl_sig_tys = impl_sig_tys.skip_binder().inputs_and_output;
obl_hdr == impl_hdr
&& obl_sig_tys.len() == impl_sig_tys.len()

14
compiler/rustc_type_ir/src/ty_kind.rs
View File

@ -928,7 +928,7 @@ pub fn is_fn_trait_compatible(&self) -> bool {
pub fn split(self) -> (ty::Binder<I, FnSigTys<I>>, FnHeader<I>) {
let hdr =
FnHeader { c_variadic: self.c_variadic(), safety: self.safety(), abi: self.abi() };
(self.map_bound(|sig| FnSigTys(sig.inputs_and_output)), hdr)
(self.map_bound(|sig| FnSigTys { inputs_and_output: sig.inputs_and_output }), hdr)
}
}
@ -971,15 +971,17 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
#[derive_where(Clone, Copy, Debug, PartialEq, Eq, Hash; I: Interner)]
#[cfg_attr(feature = "nightly", derive(TyEncodable, TyDecodable, HashStable_NoContext))]
#[derive(TypeVisitable_Generic, TypeFoldable_Generic, Lift_Generic)]
pub struct FnSigTys<I: Interner>(pub I::Tys);
pub struct FnSigTys<I: Interner> {
pub inputs_and_output: I::Tys,
}
impl<I: Interner> FnSigTys<I> {
pub fn inputs(self) -> I::FnInputTys {
self.0.inputs()
self.inputs_and_output.inputs()
}
pub fn output(self) -> I::Ty {
self.0.output()
self.inputs_and_output.output()
}
}
@ -987,7 +989,7 @@ impl<I: Interner> ty::Binder<I, FnSigTys<I>> {
// Used to combine the two fields in `TyKind::FnPtr` into a single value.
pub fn with(self, hdr: FnHeader<I>) -> ty::Binder<I, FnSig<I>> {
self.map_bound(|sig_tys| FnSig {
inputs_and_output: sig_tys.0,
inputs_and_output: sig_tys.inputs_and_output,
c_variadic: hdr.c_variadic,
safety: hdr.safety,
abi: hdr.abi,
@ -1006,7 +1008,7 @@ pub fn input(self, index: usize) -> ty::Binder<I, I::Ty> {
}
pub fn inputs_and_output(self) -> ty::Binder<I, I::Tys> {
self.map_bound(|sig_tys| sig_tys.0)
self.map_bound(|sig_tys| sig_tys.inputs_and_output)
}
#[inline]