diff options
| author | The Miri Conjob Bot <miri@cron.bot> | 2024-01-26 05:09:55 +0000 |
|---|---|---|
| committer | The Miri Conjob Bot <miri@cron.bot> | 2024-01-26 05:09:55 +0000 |
| commit | b07da7103f0693484affede39264f2a80ad660b2 (patch) | |
| tree | 75ab5da8f5f8ec79a6ff7333396b9bcd2c56f95b /compiler/rustc_data_structures/src | |
| parent | 88e1620760413f43b2ae44684cb2ace869a15b1c (diff) | |
| parent | dd2559e08e1530806740931037d6bb83ef956161 (diff) | |
| download | rust-b07da7103f0693484affede39264f2a80ad660b2.tar.gz rust-b07da7103f0693484affede39264f2a80ad660b2.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/sharded.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/map.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/sharded.rs b/compiler/rustc_data_structures/src/sharded.rs index 162dbd234d6..4b02b183460 100644 --- a/compiler/rustc_data_structures/src/sharded.rs +++ b/compiler/rustc_data_structures/src/sharded.rs @@ -3,7 +3,7 @@ use crate::fx::{FxHashMap, FxHasher}; use crate::sync::{is_dyn_thread_safe, CacheAligned}; use crate::sync::{Lock, LockGuard, Mode}; #[cfg(parallel_compiler)] -use itertools::Either; +use either::Either; use std::borrow::Borrow; use std::collections::hash_map::RawEntryMut; use std::hash::{Hash, Hasher}; diff --git a/compiler/rustc_data_structures/src/sso/map.rs b/compiler/rustc_data_structures/src/sso/map.rs index 04e359a5470..2ef4a2ccd84 100644 --- a/compiler/rustc_data_structures/src/sso/map.rs +++ b/compiler/rustc_data_structures/src/sso/map.rs @@ -1,6 +1,6 @@ use crate::fx::FxHashMap; use arrayvec::ArrayVec; -use itertools::Either; +use either::Either; use std::fmt; use std::hash::Hash; use std::ops::Index; |