Skip to content

Commit 8c1ba59

Browse files
authored
Rollup merge of rust-lang#120325 - cuviper:either-data, r=compiler-errors
rustc_data_structures: use either instead of itertools `itertools::Either` is a re-export from `either`, so we might as well use the source. This flattens the compiler build tree a little, but I don't really expect it to make much difference overall.
2 parents a1ecced + 8f3af4c commit 8c1ba59

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Cargo.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -3654,10 +3654,10 @@ version = "0.0.0"
36543654
dependencies = [
36553655
"arrayvec",
36563656
"bitflags 2.4.1",
3657+
"either",
36573658
"elsa",
36583659
"ena",
36593660
"indexmap",
3660-
"itertools",
36613661
"jobserver",
36623662
"libc",
36633663
"measureme",

compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ edition = "2021"
77
# tidy-alphabetical-start
88
arrayvec = { version = "0.7", default-features = false }
99
bitflags = "2.4.1"
10+
either = "1.0"
1011
elsa = "=1.7.1"
1112
ena = "0.14.2"
1213
indexmap = { version = "2.0.0" }
13-
itertools = "0.11"
1414
jobserver_crate = { version = "0.1.27", package = "jobserver" }
1515
libc = "0.2"
1616
measureme = "11"

compiler/rustc_data_structures/src/sharded.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::fx::{FxHashMap, FxHasher};
33
use crate::sync::{is_dyn_thread_safe, CacheAligned};
44
use crate::sync::{Lock, LockGuard, Mode};
55
#[cfg(parallel_compiler)]
6-
use itertools::Either;
6+
use either::Either;
77
use std::borrow::Borrow;
88
use std::collections::hash_map::RawEntryMut;
99
use std::hash::{Hash, Hasher};

compiler/rustc_data_structures/src/sso/map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::fx::FxHashMap;
22
use arrayvec::ArrayVec;
3-
use itertools::Either;
3+
use either::Either;
44
use std::fmt;
55
use std::hash::Hash;
66
use std::ops::Index;

0 commit comments

Comments
 (0)