diff options
| author | bors <bors@rust-lang.org> | 2024-01-06 15:50:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-06 15:50:44 +0000 |
| commit | b6a8c762eed0ae0383658c38d65cb91bbd9800a1 (patch) | |
| tree | f8b0eccaad8e13a182a0d397b0ed5e37b8119d4d /compiler/rustc_data_structures | |
| parent | 9212108a9b32cc381995cf509dd2627123c11a25 (diff) | |
| parent | 5f0f02810684e1d08c5d1a38acff79f5300086f0 (diff) | |
| download | rust-b6a8c762eed0ae0383658c38d65cb91bbd9800a1.tar.gz rust-b6a8c762eed0ae0383658c38d65cb91bbd9800a1.zip | |
Auto merge of #119662 - matthiaskrgr:rollup-ehofh5n, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #118194 (rustdoc: search for tuples and unit by type with `()`)
- #118781 (merge core_panic feature into panic_internals)
- #119486 (pass allow-{dirty,staged} to clippy)
- #119591 (rustc_mir_transform: Make DestinationPropagation stable for queries)
- #119595 (Fixed ambiguity in hint.rs)
- #119624 (rustc_span: More consistent span combination operations)
- #119653 (compiler: update Fuchsia sanitizer support.)
- #119655 (Remove ignore-stage1 that was added when changing error count msg)
- #119661 (Strip lld-wrapper binaries)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures')
| -rw-r--r-- | compiler/rustc_data_structures/src/fx.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_data_structures/src/fx.rs b/compiler/rustc_data_structures/src/fx.rs index 9fce0e1e65c..80e72250470 100644 --- a/compiler/rustc_data_structures/src/fx.rs +++ b/compiler/rustc_data_structures/src/fx.rs @@ -7,6 +7,7 @@ pub type StdEntry<'a, K, V> = std::collections::hash_map::Entry<'a, K, V>; pub type FxIndexMap<K, V> = indexmap::IndexMap<K, V, BuildHasherDefault<FxHasher>>; pub type FxIndexSet<V> = indexmap::IndexSet<V, BuildHasherDefault<FxHasher>>; pub type IndexEntry<'a, K, V> = indexmap::map::Entry<'a, K, V>; +pub type IndexOccupiedEntry<'a, K, V> = indexmap::map::OccupiedEntry<'a, K, V>; #[macro_export] macro_rules! define_id_collections { |