diff options
author | Aleksey Kladov <[email protected]> | 2019-12-21 14:04:33 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-12-21 14:04:33 +0000 |
commit | 973b5cf7e20842711d59a810b268796b26241382 (patch) | |
tree | 7025977c0333378cd209dc47c1d160c7cdef206a /crates/ra_hir_def/src/trace.rs | |
parent | a1f4c988e47b7160b11070d18f50657b6fb9014c (diff) |
Revert "Merge #2629"
This reverts commit cdc9d682b066b110e0a44e5f8f1c574b38c16ba9, reversing
changes made to 90ef070db3dce0a7acb9cd11d0b0d72de13c9d79.
Diffstat (limited to 'crates/ra_hir_def/src/trace.rs')
-rw-r--r-- | crates/ra_hir_def/src/trace.rs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crates/ra_hir_def/src/trace.rs b/crates/ra_hir_def/src/trace.rs index 9769e88df..2bcd707bc 100644 --- a/crates/ra_hir_def/src/trace.rs +++ b/crates/ra_hir_def/src/trace.rs | |||
@@ -18,6 +18,10 @@ pub(crate) struct Trace<ID: ArenaId, T, V> { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> { | 20 | impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> { |
21 | pub(crate) fn new() -> Trace<ID, T, V> { | ||
22 | Trace { arena: Some(Arena::default()), map: Some(ArenaMap::default()), len: 0 } | ||
23 | } | ||
24 | |||
21 | pub(crate) fn new_for_arena() -> Trace<ID, T, V> { | 25 | pub(crate) fn new_for_arena() -> Trace<ID, T, V> { |
22 | Trace { arena: Some(Arena::default()), map: None, len: 0 } | 26 | Trace { arena: Some(Arena::default()), map: None, len: 0 } |
23 | } | 27 | } |
@@ -48,4 +52,8 @@ impl<ID: ra_arena::ArenaId + Copy, T, V> Trace<ID, T, V> { | |||
48 | pub(crate) fn into_map(mut self) -> ArenaMap<ID, V> { | 52 | pub(crate) fn into_map(mut self) -> ArenaMap<ID, V> { |
49 | self.map.take().unwrap() | 53 | self.map.take().unwrap() |
50 | } | 54 | } |
55 | |||
56 | pub(crate) fn into_arena_and_map(mut self) -> (Arena<ID, T>, ArenaMap<ID, V>) { | ||
57 | (self.arena.take().unwrap(), self.map.take().unwrap()) | ||
58 | } | ||
51 | } | 59 | } |