diff options
| author | Scott McMurray <scottmcm@users.noreply.github.com> | 2021-12-05 20:17:35 -0800 |
|---|---|---|
| committer | Scott McMurray <scottmcm@users.noreply.github.com> | 2021-12-05 20:17:35 -0800 |
| commit | 308fd59f42dff89e55dff1c7a85fa9fa2411cab3 (patch) | |
| tree | 8225260b030ecb9b41f2db4a423f4fe2dbf60d20 /compiler/rustc_data_structures/src/sso | |
| parent | 2a9e0831d6603d87220cedd1b1293e2eb82ef55c (diff) | |
| download | rust-308fd59f42dff89e55dff1c7a85fa9fa2411cab3.tar.gz rust-308fd59f42dff89e55dff1c7a85fa9fa2411cab3.zip | |
Stop enabling `in_band_lifetimes` in rustc_data_structures
There's a conversation in the tracking issue about possibly unaccepting `in_band_lifetimes`, but it's used heavily in the compiler, and thus there'd need to be a bunch of PRs like this if that were to happen. So here's one to see how much of an impact it has. (Oh, and I removed `nll` while I was here too, since it didn't seem needed. Let me know if I should put that back.)
Diffstat (limited to 'compiler/rustc_data_structures/src/sso')
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/map.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/sso/set.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_data_structures/src/sso/map.rs b/compiler/rustc_data_structures/src/sso/map.rs index 2de05cd4e56..ec6a62016a8 100644 --- a/compiler/rustc_data_structures/src/sso/map.rs +++ b/compiler/rustc_data_structures/src/sso/map.rs @@ -423,14 +423,14 @@ impl<K, V> IntoIterator for SsoHashMap<K, V> { /// adapts Item of array reference iterator to Item of hashmap reference iterator. #[inline(always)] -fn adapt_array_ref_it<K, V>(pair: &'a (K, V)) -> (&'a K, &'a V) { +fn adapt_array_ref_it<K, V>(pair: &(K, V)) -> (&K, &V) { let (a, b) = pair; (a, b) } /// adapts Item of array mut reference iterator to Item of hashmap mut reference iterator. #[inline(always)] -fn adapt_array_mut_it<K, V>(pair: &'a mut (K, V)) -> (&'a K, &'a mut V) { +fn adapt_array_mut_it<K, V>(pair: &mut (K, V)) -> (&K, &mut V) { let (a, b) = pair; (a, b) } diff --git a/compiler/rustc_data_structures/src/sso/set.rs b/compiler/rustc_data_structures/src/sso/set.rs index 29baf4e1ddb..f71522d3714 100644 --- a/compiler/rustc_data_structures/src/sso/set.rs +++ b/compiler/rustc_data_structures/src/sso/set.rs @@ -75,7 +75,7 @@ impl<T> SsoHashSet<T> { /// An iterator visiting all elements in arbitrary order. /// The iterator element type is `&'a T`. #[inline] - pub fn iter(&'a self) -> impl Iterator<Item = &'a T> { + pub fn iter(&self) -> impl Iterator<Item = &T> { self.into_iter() } |
