Auto merge of #2551 - RalfJung:rustup, r=RalfJung

rustup Cc rust-lang/rust#101867
rust-lang · Sep 19, 2022 · 16528ef · 16528ef
2 parents 0def954 + f0c6f0d
commit 16528ef
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/cargo-miri/src/main.rs b/cargo-miri/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(let_else)]
 #![allow(clippy::useless_format, clippy::derive_partial_eq_without_eq, rustc::internal)]
 
 #[macro_use]

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-5197c96c49fc3b7de3ce9a31f7cc62d2cbd1f70c
+2019147c5642c08cdb9ad4cacd97dd1fa4ffa701
diff --git a/src/lib.rs b/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(map_try_insert)]
 #![feature(never_type)]
 #![feature(try_blocks)]
-#![feature(let_else)]
 #![feature(io_error_more)]
 #![feature(int_log)]
 #![feature(variant_count)]

diff --git a/src/shims/unix/sync.rs b/src/shims/unix/sync.rs
@@ -1,7 +1,7 @@
 use std::time::SystemTime;
 
 use rustc_hir::LangItem;
-use rustc_middle::ty::{layout::TyAndLayout, query::TyCtxtAt, subst::Subst, Ty};
+use rustc_middle::ty::{layout::TyAndLayout, query::TyCtxtAt, Ty};
 
 use crate::concurrency::thread::Time;
 use crate::*;