Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #150697 - hkBst:relate-3, r=Kivooeo

Browse Source 
relate.rs: tiny cleanup: eliminate temp vars 2

Continuation of rust-lang/rust#150678

r? `@Kivooeo`
This commit is contained in:
Jakub Beránek
2026-01-05 15:54:14 +01:00
committed by GitHub
parent 5bcdc7c131 3d6a2c5ae1
commit 469a26439c
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_type_ir/src/relate.rs
+3 -15
View File
@@ -216,11 +216,7 @@ fn relate<R: TypeRelation<I>>(
b: ty::AliasTy<I>,
) -> RelateResult<I, ty::AliasTy<I>> {
if a.def_id != b.def_id {
Err(TypeError::ProjectionMismatched({
let a = a.def_id;
let b = b.def_id;
ExpectedFound::new(a, b)
}))
Err(TypeError::ProjectionMismatched(ExpectedFound::new(a.def_id, b.def_id)))
} else {
let cx = relation.cx();
let args = if let Some(variances) = cx.opt_alias_variances(a.kind(cx), a.def_id) {
@@ -240,11 +236,7 @@ fn relate<R: TypeRelation<I>>(
b: ty::AliasTerm<I>,
) -> RelateResult<I, ty::AliasTerm<I>> {
if a.def_id != b.def_id {
Err(TypeError::ProjectionMismatched({
let a = a.def_id;
let b = b.def_id;
ExpectedFound::new(a, b)
}))
Err(TypeError::ProjectionMismatched(ExpectedFound::new(a.def_id, b.def_id)))
} else {
let args = match a.kind(relation.cx()) {
ty::AliasTermKind::OpaqueTy => relate_args_with_variances(
@@ -275,11 +267,7 @@ fn relate<R: TypeRelation<I>>(
b: ty::ExistentialProjection<I>,
) -> RelateResult<I, ty::ExistentialProjection<I>> {
if a.def_id != b.def_id {
Err(TypeError::ProjectionMismatched({
let a = a.def_id;
let b = b.def_id;
ExpectedFound::new(a, b)
}))
Err(TypeError::ProjectionMismatched(ExpectedFound::new(a.def_id, b.def_id)))
} else {
let term = relation.relate_with_variance(
ty::Invariant,