nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-15 05:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some more duplication

Browse Source
This commit is contained in:
Oli Scherer 2025-04-10 08:15:03 +00:00
parent 673012faf7
commit f80b12129e
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler/rustc_hir_typeck/src/coercion.rs
View File

@ -586,17 +586,12 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
// for the former and let type inference do the rest.
let coerce_target = self.next_ty_var(self.cause.span);
let mut coercion = match reborrow {
None => {
self.unify_and(coerce_target, target, [], Adjust::Pointer(PointerCoercion::Unsize))?
}
Some((ref deref, ref autoref)) => self.unify_and(
coerce_target,
target,
[deref.clone(), autoref.clone()],
Adjust::Pointer(PointerCoercion::Unsize),
)?,
};
let mut coercion = self.unify_and(
coerce_target,
target,
reborrow.into_iter().flat_map(|(deref, autoref)| [deref, autoref]),
Adjust::Pointer(PointerCoercion::Unsize),
)?;
let mut selcx = traits::SelectionContext::new(self);
@ -836,20 +831,13 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
&& hdr_b.safety.is_unsafe()
{
let unsafe_a = self.tcx.safe_to_unsafe_fn_ty(fn_ty_a);
match adjustment {
Some(kind) => self.unify_and(
unsafe_a,
b,
[Adjustment { kind, target: Ty::new_fn_ptr(self.tcx, fn_ty_a) }],
Adjust::Pointer(PointerCoercion::UnsafeFnPointer),
),
None => self.unify_and(
unsafe_a,
b,
[],
Adjust::Pointer(PointerCoercion::UnsafeFnPointer),
),
}
self.unify_and(
unsafe_a,
b,
adjustment
.map(|kind| Adjustment { kind, target: Ty::new_fn_ptr(self.tcx, fn_ty_a) }),
Adjust::Pointer(PointerCoercion::UnsafeFnPointer),
)
} else {
let a = Ty::new_fn_ptr(self.tcx, fn_ty_a);
match adjustment {