diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-17 08:01:20 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-17 08:01:20 +0000 |
commit | 93e189604916a64423c5722c2b95722b79fec0cd (patch) | |
tree | 8c1fbb02902eb1f77500eb2f328da8c17f06510e /crates/hir_def/src/item_tree.rs | |
parent | 3224ecea8734f850eda474c136ae4dcb7e1aa3f1 (diff) | |
parent | 1d103cf087c574f66279490ffef8c76178aea5cc (diff) |
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]>
Diffstat (limited to 'crates/hir_def/src/item_tree.rs')
-rw-r--r-- | crates/hir_def/src/item_tree.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs index 91e42aa0d..9a433b61c 100644 --- a/crates/hir_def/src/item_tree.rs +++ b/crates/hir_def/src/item_tree.rs | |||
@@ -20,7 +20,7 @@ use hir_expand::{ | |||
20 | name::{name, AsName, Name}, | 20 | name::{name, AsName, Name}, |
21 | HirFileId, InFile, | 21 | HirFileId, InFile, |
22 | }; | 22 | }; |
23 | use la_arena::{Arena, Idx, RawId}; | 23 | use la_arena::{Arena, Idx, RawIdx}; |
24 | use rustc_hash::FxHashMap; | 24 | use rustc_hash::FxHashMap; |
25 | use smallvec::SmallVec; | 25 | use smallvec::SmallVec; |
26 | use syntax::{ast, match_ast}; | 26 | use syntax::{ast, match_ast}; |