1 files changed, 11 insertions, 11 deletions

diff --git a/crates/ra_hir_def/src/trace.rs b/crates/ra_hir_def/src/trace.rs
index 9769e88df..ced07577d 100644
--- a/crates/ra_hir_def/src/trace.rs
+++ b/crates/ra_hir_def/src/trace.rs
@@ -9,28 +9,28 @@
 //! absolute offsets. The `Trace` structure (inspired, at least in name, by
 //! Kotlin's `BindingTrace`) allows use the same code to compute both
 //! projections.
-use ra_arena::{map::ArenaMap, Arena, ArenaId, RawId};
+use ra_arena::{map::ArenaMap, Arena, Idx, RawId};
 
-pub(crate) struct Trace<ID: ArenaId, T, V> {
-    arena: Option<Arena<ID, T>>,
-    map: Option<ArenaMap<ID, V>>,
+pub(crate) struct Trace<T, V> {
+    arena: Option<Arena<T>>,
+    map: Option<ArenaMap<Idx<T>, V>>,
     len: u32,
 }
 
-impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> {
-    pub(crate) fn new_for_arena() -> Trace<ID, T, V> {
+impl<T, V> Trace<T, V> {
+    pub(crate) fn new_for_arena() -> Trace<T, V> {
         Trace { arena: Some(Arena::default()), map: None, len: 0 }
     }
 
-    pub(crate) fn new_for_map() -> Trace<ID, T, V> {
+    pub(crate) fn new_for_map() -> Trace<T, V> {
         Trace { arena: None, map: Some(ArenaMap::default()), len: 0 }
     }
 
-    pub(crate) fn alloc(&mut self, value: impl FnOnce() -> V, data: impl FnOnce() -> T) -> ID {
+    pub(crate) fn alloc(&mut self, value: impl FnOnce() -> V, data: impl FnOnce() -> T) -> Idx<T> {
         let id = if let Some(arena) = &mut self.arena {
             arena.alloc(data())
         } else {
-            let id = ID::from_raw(RawId::from(self.len));
+            let id = Idx::<T>::from_raw(RawId::from(self.len));
             self.len += 1;
             id
         };
@@ -41,11 +41,11 @@ impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> {
         id
     }
 
-    pub(crate) fn into_arena(mut self) -> Arena<ID, T> {
+    pub(crate) fn into_arena(mut self) -> Arena<T> {
         self.arena.take().unwrap()
     }
 
-    pub(crate) fn into_map(mut self) -> ArenaMap<ID, V> {
+    pub(crate) fn into_map(mut self) -> ArenaMap<Idx<T>, V> {
         self.map.take().unwrap()
     }
 }