Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 13:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17880 - lnicola:sync-from-rust, r=lnicola

Browse source 
minor: sync from downstream
This commit is contained in:
bors 2024-08-13 15:01:50 +00:00
commit 78c2bdce86
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/hir-ty/src/mir/eval/shim.rs
View file

@ -27,6 +27,7 @@ macro_rules! from_bytes {
($ty:tt, $value:expr) => { ($ty:tt, $value:expr) => {
($ty::from_le_bytes(match ($value).try_into() { ($ty::from_le_bytes(match ($value).try_into() {
Ok(it) => it, Ok(it) => it,
#[allow(unreachable_patterns)]
Err(_) => return Err(MirEvalError::InternalError("mismatched size".into())), Err(_) => return Err(MirEvalError::InternalError("mismatched size".into())),
})) }))
}; };

1
crates/hir-ty/src/mir/lower.rs
View file

@ -1161,6 +1161,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
ProjectionElem::OpaqueCast(it) => { ProjectionElem::OpaqueCast(it) => {
ProjectionElem::OpaqueCast(it) ProjectionElem::OpaqueCast(it)
} }
#[allow(unreachable_patterns)]
ProjectionElem::Index(it) => match it {}, ProjectionElem::Index(it) => match it {},
}) })
.collect(), .collect(),

2
rust-version
View file

@ -1 +1 @@
1b51d80027919563004918eaadfa0d890ac0eb93 80eb5a8e910e5185d47cdefe3732d839c78a5e7e