aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-11-28 18:03:30 +0000
committerAleksey Kladov <[email protected]>2018-11-28 18:03:30 +0000
commit70a7cb34ec18d30a680a73727e1d87a0a786dc44 (patch)
treee23d6bf49854c5ad42683accaf3f0c43488188a4 /crates/ra_hir
parent0cda188621b792265c957bdf4ac54af31cbc9947 (diff)
switch to released id-arena
Diffstat (limited to 'crates/ra_hir')
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_hir/src/arena.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 9bde289e7..1b9e148b2 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -10,7 +10,7 @@ relative-path = "0.4.0"
10salsa = "0.8.0" 10salsa = "0.8.0"
11rustc-hash = "1.0" 11rustc-hash = "1.0"
12parking_lot = "0.6.4" 12parking_lot = "0.6.4"
13id-arena = { git = "https://github.com/fitzgen/id-arena/", rev = "43ecd67" } 13id-arena = "2.0"
14ra_syntax = { path = "../ra_syntax" } 14ra_syntax = { path = "../ra_syntax" }
15ra_editor = { path = "../ra_editor" } 15ra_editor = { path = "../ra_editor" }
16ra_db = { path = "../ra_db" } 16ra_db = { path = "../ra_db" }
diff --git a/crates/ra_hir/src/arena.rs b/crates/ra_hir/src/arena.rs
index 8d67ab1c9..d4f9d9cb9 100644
--- a/crates/ra_hir/src/arena.rs
+++ b/crates/ra_hir/src/arena.rs
@@ -46,10 +46,10 @@ pub(crate) struct ArenaBehavior<T> {
46 46
47impl<T> id_arena::ArenaBehavior for ArenaBehavior<T> { 47impl<T> id_arena::ArenaBehavior for ArenaBehavior<T> {
48 type Id = Id<T>; 48 type Id = Id<T>;
49 fn new_arena_id() -> usize { 49 fn new_arena_id() -> u32 {
50 0 50 0
51 } 51 }
52 fn new_id(_arena_id: usize, index: usize) -> Id<T> { 52 fn new_id(_arena_id: u32, index: usize) -> Id<T> {
53 Id { 53 Id {
54 idx: index as u32, 54 idx: index as u32,
55 _ty: PhantomData, 55 _ty: PhantomData,
@@ -58,7 +58,7 @@ impl<T> id_arena::ArenaBehavior for ArenaBehavior<T> {
58 fn index(id: Id<T>) -> usize { 58 fn index(id: Id<T>) -> usize {
59 id.idx as usize 59 id.idx as usize
60 } 60 }
61 fn arena_id(_id: Id<T>) -> usize { 61 fn arena_id(_id: Id<T>) -> u32 {
62 0 62 0
63 } 63 }
64} 64}