nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #120325 - cuviper:either-data, r=compiler-errors

Browse Source 
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.
This commit is contained in:
Matthias Krüger 2024-01-25 08:39:45 +01:00 committed by GitHub
commit 8c1ba5931c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock
View File

@ -3654,10 +3654,10 @@ version = "0.0.0"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bitflags 2.4.1", "bitflags 2.4.1",
"either",
"elsa", "elsa",
"ena", "ena",
"indexmap", "indexmap",
"itertools",
"jobserver", "jobserver",
"libc", "libc",
"measureme", "measureme",

2
compiler/rustc_data_structures/Cargo.toml
View File

@ -7,10 +7,10 @@ edition = "2021"
# tidy-alphabetical-start # tidy-alphabetical-start
arrayvec = { version = "0.7", default-features = false } arrayvec = { version = "0.7", default-features = false }
bitflags = "2.4.1" bitflags = "2.4.1"
either = "1.0"
elsa = "=1.7.1" elsa = "=1.7.1"
ena = "0.14.2" ena = "0.14.2"
indexmap = { version = "2.0.0" } indexmap = { version = "2.0.0" }
itertools = "0.11"
jobserver_crate = { version = "0.1.27", package = "jobserver" } jobserver_crate = { version = "0.1.27", package = "jobserver" }
libc = "0.2" libc = "0.2"
measureme = "11" measureme = "11"

2
compiler/rustc_data_structures/src/sharded.rs
View File

@ -3,7 +3,7 @@ use crate::fx::{FxHashMap, FxHasher};
use crate::sync::{is_dyn_thread_safe, CacheAligned}; use crate::sync::{is_dyn_thread_safe, CacheAligned};
use crate::sync::{Lock, LockGuard, Mode}; use crate::sync::{Lock, LockGuard, Mode};
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
use itertools::Either; use either::Either;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::collections::hash_map::RawEntryMut; use std::collections::hash_map::RawEntryMut;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};

2
compiler/rustc_data_structures/src/sso/map.rs
View File

@ -1,6 +1,6 @@
use crate::fx::FxHashMap; use crate::fx::FxHashMap;
use arrayvec::ArrayVec; use arrayvec::ArrayVec;
use itertools::Either; use either::Either;
use std::fmt; use std::fmt;
use std::hash::Hash; use std::hash::Hash;
use std::ops::Index; use std::ops::Index;