From 855af088b8567bc20805e544b8e38f67b409702a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 9 Apr 2022 11:20:32 -0400
Subject: [PATCH] remove no longer needed imports

---
 src/bin/miri.rs            | 1 -
 src/eval.rs                | 1 -
 src/helpers.rs             | 1 -
 src/shims/backtrace.rs     | 1 -
 src/shims/env.rs           | 1 -
 src/shims/foreign_items.rs | 6 +-----
 src/shims/intrinsics.rs    | 1 -
 src/shims/os_str.rs        | 1 -
 src/shims/posix/fs.rs      | 1 -
 src/shims/posix/thread.rs  | 2 --
 src/shims/time.rs          | 1 -
 src/sync.rs                | 1 -
 src/thread.rs              | 1 -
 src/vector_clock.rs        | 2 +-
 14 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
index be4776f459cd..727e0b717b11 100644
--- a/src/bin/miri.rs
+++ b/src/bin/miri.rs
@@ -9,7 +9,6 @@ extern crate rustc_metadata;
 extern crate rustc_middle;
 extern crate rustc_session;
 
-use std::convert::TryFrom;
 use std::env;
 use std::num::NonZeroU64;
 use std::path::PathBuf;
diff --git a/src/eval.rs b/src/eval.rs
index 4c006867e177..5f829525cc57 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -1,6 +1,5 @@
 //! Main evaluator loop and setting up the initial stack frame.
 
-use std::convert::TryFrom;
 use std::ffi::OsStr;
 use std::iter;
 
diff --git a/src/helpers.rs b/src/helpers.rs
index 9e4527d592b3..5b6e616400b4 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -1,4 +1,3 @@
-use std::convert::{TryFrom, TryInto};
 use std::mem;
 use std::num::NonZeroUsize;
 use std::time::Duration;
diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs
index 32fbbffc63f8..2ec4bbb32e02 100644
--- a/src/shims/backtrace.rs
+++ b/src/shims/backtrace.rs
@@ -4,7 +4,6 @@ use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_middle::ty::{self, Instance};
 use rustc_span::{BytePos, Loc, Symbol};
 use rustc_target::{abi::Size, spec::abi::Abi};
-use std::convert::TryInto as _;
 
 impl<'mir, 'tcx: 'mir> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
diff --git a/src/shims/env.rs b/src/shims/env.rs
index 7be26de45916..3b1b1f011e3e 100644
--- a/src/shims/env.rs
+++ b/src/shims/env.rs
@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::env;
 use std::ffi::{OsStr, OsString};
 use std::io::ErrorKind;
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index 77567e9bcae5..7b457e9ed79a 100644
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -1,8 +1,4 @@
-use std::{
-    collections::hash_map::Entry,
-    convert::{TryFrom, TryInto},
-    iter,
-};
+use std::{collections::hash_map::Entry, iter};
 
 use log::trace;
 
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index 9101cbcf05ff..58e546d6b0b0 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::iter;
 
 use log::trace;
diff --git a/src/shims/os_str.rs b/src/shims/os_str.rs
index c03f7ad79be7..8db75fed4a5f 100644
--- a/src/shims/os_str.rs
+++ b/src/shims/os_str.rs
@@ -1,5 +1,4 @@
 use std::borrow::Cow;
-use std::convert::TryFrom;
 use std::ffi::{OsStr, OsString};
 use std::iter;
 use std::path::{Path, PathBuf};
diff --git a/src/shims/posix/fs.rs b/src/shims/posix/fs.rs
index 5395d0f0bf11..73e21dd57dc4 100644
--- a/src/shims/posix/fs.rs
+++ b/src/shims/posix/fs.rs
@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 use std::collections::BTreeMap;
-use std::convert::{TryFrom, TryInto};
 use std::fs::{
     read_dir, remove_dir, remove_file, rename, DirBuilder, File, FileType, OpenOptions, ReadDir,
 };
diff --git a/src/shims/posix/thread.rs b/src/shims/posix/thread.rs
index 69875a9ffc44..7840a1e1e970 100644
--- a/src/shims/posix/thread.rs
+++ b/src/shims/posix/thread.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use crate::*;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_target::spec::abi::Abi;
diff --git a/src/shims/time.rs b/src/shims/time.rs
index 0acd697fa405..78bf6f59b349 100644
--- a/src/shims/time.rs
+++ b/src/shims/time.rs
@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::time::{Duration, Instant, SystemTime};
 
 use crate::*;
diff --git a/src/sync.rs b/src/sync.rs
index 9007f25ce5c7..bbcd39333c78 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -1,5 +1,4 @@
 use std::collections::{hash_map::Entry, HashMap, VecDeque};
-use std::convert::TryFrom;
 use std::num::NonZeroU32;
 use std::ops::Not;
 
diff --git a/src/thread.rs b/src/thread.rs
index 2c5f6c2391f0..96131dba3ca6 100644
--- a/src/thread.rs
+++ b/src/thread.rs
@@ -2,7 +2,6 @@
 
 use std::cell::RefCell;
 use std::collections::hash_map::Entry;
-use std::convert::TryFrom;
 use std::num::TryFromIntError;
 use std::time::{Duration, Instant, SystemTime};
 
diff --git a/src/vector_clock.rs b/src/vector_clock.rs
index 74180f25b3bb..e13e9c39fc69 100644
--- a/src/vector_clock.rs
+++ b/src/vector_clock.rs
@@ -1,6 +1,6 @@
 use rustc_index::vec::Idx;
 use smallvec::SmallVec;
-use std::{cmp::Ordering, convert::TryFrom, fmt::Debug, ops::Index};
+use std::{cmp::Ordering, fmt::Debug, ops::Index};
 
 /// A vector clock index, this is associated with a thread id
 /// but in some cases one vector index may be shared with