mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove count

Browse source
This commit is contained in:
John Kåre Alsaker 2023-08-16 10:44:32 +02:00
parent 81220c0ace
commit 0823f0c32b
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_data_structures/src/sharded.rs
View file

@ -49,7 +49,7 @@ impl<T> Sharded<T> {
match self { match self {
Self::Single(single) => &single, Self::Single(single) => &single,
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
Self::Shards(shards) => self.get_shard_by_hash(make_hash(_val)), Self::Shards(..) => self.get_shard_by_hash(make_hash(_val)),
} }
} }
@ -70,21 +70,20 @@ impl<T> Sharded<T> {
} }
} }
#[inline] pub fn lock_shards(&self) -> Vec<LockGuard<'_, T>> {
fn count(&self) -> usize {
match self { match self {
Self::Single(..) => 1, Self::Single(single) => vec![single.lock()],
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
Self::Shards(..) => SHARDS, Self::Shards(shards) => shards.iter().map(|shard| shard.0.lock()).collect(),
} }
} }
pub fn lock_shards(&self) -> Vec<LockGuard<'_, T>> {
(0..self.count()).map(|i| self.get_shard_by_index(i).lock()).collect()
}
pub fn try_lock_shards(&self) -> Option<Vec<LockGuard<'_, T>>> { pub fn try_lock_shards(&self) -> Option<Vec<LockGuard<'_, T>>> {
(0..self.count()).map(|i| self.get_shard_by_index(i).try_lock()).collect() match self {
Self::Single(single) => Some(vec![single.try_lock()?]),
#[cfg(parallel_compiler)]
Self::Shards(shards) => shards.iter().map(|shard| shard.0.try_lock()).collect(),
}
} }
} }