diff options
| author | Ralf Jung <post@ralfj.de> | 2022-09-19 22:32:36 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-09-19 22:32:36 +0200 |
| commit | f0c6f0d1bf3f752079f94d8ecf2f4536cdeb46f2 (patch) | |
| tree | 32a90d015dd5d097fdfafe6eb089a36d6b790d26 | |
| parent | 0def954aab97701075317a507995af3d57719b61 (diff) | |
| download | rust-f0c6f0d1bf3f752079f94d8ecf2f4536cdeb46f2.tar.gz rust-f0c6f0d1bf3f752079f94d8ecf2f4536cdeb46f2.zip | |
rustup
| -rw-r--r-- | cargo-miri/src/main.rs | 1 | ||||
| -rw-r--r-- | rust-version | 2 | ||||
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/shims/unix/sync.rs | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/cargo-miri/src/main.rs b/cargo-miri/src/main.rs index 09e2cd3c286..331c4c9c2b0 100644 --- 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 index 56acee2246c..af94ff9ea6b 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -5197c96c49fc3b7de3ce9a31f7cc62d2cbd1f70c +2019147c5642c08cdb9ad4cacd97dd1fa4ffa701 diff --git a/src/lib.rs b/src/lib.rs index 016ed01f4da..9b3be6128ca 100644 --- 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 index 496985fd083..8d9487b04de 100644 --- 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::*; |