Merge #7275

7275: Make arena index vs ID naming consistent r=matklad a=arzg

This makes naming consistent with `la_arena::RawId`. Alternatively, la-arena’s documentation could be updated to use ‘index’ terminology instead of ‘ID’ terminology, and `RawId` renamed to `RawIdx`.

This pull request doesn’t compile because dependencies on la-arena go through crates.io, so existing dependencies on the crate are referencing an old version. As such, this PR will only compile once a new la-arena version has been published.

Co-authored-by: Aramis Razzaghipour <[email protected]>

1 files changed, 2 insertions, 2 deletions

diff --git a/crates/hir_def/src/trace.rs b/crates/hir_def/src/trace.rs
index 18d16986b..6e6ceb8e4 100644
--- a/crates/hir_def/src/trace.rs
+++ b/crates/hir_def/src/trace.rs
@@ -9,7 +9,7 @@
 //! absolute offsets. The `Trace` structure (inspired, at least in name, by
 //! Kotlin's `BindingTrace`) allows use the same code to compute both
 //! projections.
-use la_arena::{Arena, ArenaMap, Idx, RawId};
+use la_arena::{Arena, ArenaMap, Idx, RawIdx};
 
 pub(crate) struct Trace<T, V> {
     arena: Option<Arena<T>>,
@@ -30,7 +30,7 @@ impl<T, V> Trace<T, V> {
         let id = if let Some(arena) = &mut self.arena {
             arena.alloc(data())
         } else {
-            let id = Idx::<T>::from_raw(RawId::from(self.len));
+            let id = Idx::<T>::from_raw(RawIdx::from(self.len));
             self.len += 1;
             id
         };