diff options
| author | bors <bors@rust-lang.org> | 2023-11-23 06:41:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-23 06:41:15 +0000 |
| commit | 933bdbc5792cc770cf00ed119869b7e2d891f954 (patch) | |
| tree | 1210fbbb120a2831ec352128b5dadcf101659eed /compiler/rustc_data_structures/src | |
| parent | 41d7012a8e6c86adffc4fb431793dd5125b6af5f (diff) | |
| parent | 03f19ab7bb9453c45fadcad4097c4badc042689c (diff) | |
| download | rust-933bdbc5792cc770cf00ed119869b7e2d891f954.tar.gz rust-933bdbc5792cc770cf00ed119869b7e2d891f954.zip | |
Auto merge of #3183 - rust-lang:rustup-2023-11-23, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/dominators/mod.rs | 1 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/sharded.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/graph/dominators/mod.rs b/compiler/rustc_data_structures/src/graph/dominators/mod.rs index 5dd414cfd41..4b819e1cbd6 100644 --- a/compiler/rustc_data_structures/src/graph/dominators/mod.rs +++ b/compiler/rustc_data_structures/src/graph/dominators/mod.rs @@ -23,6 +23,7 @@ struct PreOrderFrame<Iter> { } rustc_index::newtype_index! { + #[orderable] struct PreorderIndex {} } diff --git a/compiler/rustc_data_structures/src/sharded.rs b/compiler/rustc_data_structures/src/sharded.rs index 639f05c9e52..162dbd234d6 100644 --- a/compiler/rustc_data_structures/src/sharded.rs +++ b/compiler/rustc_data_structures/src/sharded.rs @@ -50,7 +50,7 @@ impl<T> Sharded<T> { #[inline] pub fn get_shard_by_value<K: Hash + ?Sized>(&self, _val: &K) -> &Lock<T> { match self { - Self::Single(single) => &single, + Self::Single(single) => single, #[cfg(parallel_compiler)] Self::Shards(..) => self.get_shard_by_hash(make_hash(_val)), } @@ -64,7 +64,7 @@ impl<T> Sharded<T> { #[inline] pub fn get_shard_by_index(&self, _i: usize) -> &Lock<T> { match self { - Self::Single(single) => &single, + Self::Single(single) => single, #[cfg(parallel_compiler)] Self::Shards(shards) => { // SAFETY: The index gets ANDed with the shard mask, ensuring it is always inbounds. |