After-rebase fixes

Author: aerooneqq

compiler/rustc_hir/src/definitions.rs

@@ -9,7 +9,7 @@ use std::hash::Hash;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::indexmap::IndexSet;
-use rustc_data_structures::stable_hasher::StableHasher;
+use rustc_data_structures::stable_hash::StableHasher;
 use rustc_hashes::Hash64;
 use rustc_index::IndexVec;
 use rustc_macros::{BlobDecodable, Decodable, Encodable, extension};

compiler/rustc_middle/src/ty/context.rs

@@ -10,8 +10,8 @@ use std::cmp::Ordering;
 use std::env::VarError;
 use std::ffi::OsStr;
 use std::hash::{Hash, Hasher};
-use std::marker::{PhantomData, PointeeSized};
-use std::ops::{Bound, Deref};
+use std::marker::PointeeSized;
+use std::ops::Deref;
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
 use std::sync::{Arc, OnceLock};
 use std::{fmt, iter, mem};