Skip to content

Commit 78c2bdc

Browse files
committed
Auto merge of #17880 - lnicola:sync-from-rust, r=lnicola
minor: sync from downstream
2 parents e25abba + bd6fb36 commit 78c2bdc

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

crates/hir-ty/src/mir/eval/shim.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ macro_rules! from_bytes {
2727
($ty:tt, $value:expr) => {
2828
($ty::from_le_bytes(match ($value).try_into() {
2929
Ok(it) => it,
30+
#[allow(unreachable_patterns)]
3031
Err(_) => return Err(MirEvalError::InternalError("mismatched size".into())),
3132
}))
3233
};

crates/hir-ty/src/mir/lower.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,6 +1161,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
11611161
ProjectionElem::OpaqueCast(it) => {
11621162
ProjectionElem::OpaqueCast(it)
11631163
}
1164+
#[allow(unreachable_patterns)]
11641165
ProjectionElem::Index(it) => match it {},
11651166
})
11661167
.collect(),

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1b51d80027919563004918eaadfa0d890ac0eb93
1+
80eb5a8e910e5185d47cdefe3732d839c78a5e7e

0 commit comments

Comments
 (0)