Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #17880 - lnicola:sync-from-rust, r=lnicola
minor: sync from downstream
| -rw-r--r-- | crates/hir-ty/src/mir/eval/shim.rs | 1 | ||||
| -rw-r--r-- | crates/hir-ty/src/mir/lower.rs | 1 | ||||
| -rw-r--r-- | rust-version | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/crates/hir-ty/src/mir/eval/shim.rs b/crates/hir-ty/src/mir/eval/shim.rs index bd43a62341..d76f538187 100644 --- a/crates/hir-ty/src/mir/eval/shim.rs +++ b/crates/hir-ty/src/mir/eval/shim.rs @@ -27,6 +27,7 @@ macro_rules! from_bytes { ($ty:tt, $value:expr) => { ($ty::from_le_bytes(match ($value).try_into() { Ok(it) => it, + #[allow(unreachable_patterns)] Err(_) => return Err(MirEvalError::InternalError("mismatched size".into())), })) }; diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs index 057f553380..9aa2eeebc1 100644 --- a/crates/hir-ty/src/mir/lower.rs +++ b/crates/hir-ty/src/mir/lower.rs @@ -1161,6 +1161,7 @@ impl<'ctx> MirLowerCtx<'ctx> { ProjectionElem::OpaqueCast(it) => { ProjectionElem::OpaqueCast(it) } + #[allow(unreachable_patterns)] ProjectionElem::Index(it) => match it {}, }) .collect(), diff --git a/rust-version b/rust-version index 001b900b20..d4f1703d85 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1b51d80027919563004918eaadfa0d890ac0eb93 +80eb5a8e910e5185d47cdefe3732d839c78a5e7e |