Skip to content

Commit 487078f

Browse files
bors[bot]toyboot4e
andauthored
Merge #10155
10155: Minor: replace old name `CrateDefMap` in comments r=jonas-schievink a=toyboot4e This PR replaces the old name `CrateDefMap` in comments with the new name `DefMap`. The renaming was done in [57a82fb](57a82fb0) (Jan 2021). I didn't touch the working code ([CrateDefMapQueryQuery][QQ]). Thank you. [QQ]: https://github.com/rust-analyzer/rust-analyzer/blob/master/crates/ide_db/src/apply_change.rs#L126 Co-authored-by: toyboot4e <[email protected]>
2 parents ab8e3c0 + 89e46b4 commit 487078f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

crates/hir_def/src/nameres.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//! This module implements import-resolution/macro expansion algorithm.
22
//!
3-
//! The result of this module is `CrateDefMap`: a data structure which contains:
3+
//! The result of this module is `DefMap`: a data structure which contains:
44
//!
55
//! * a tree of modules for the crate
66
//! * for each module, a set of items visible in the module (directly declared
77
//! or imported)
88
//!
9-
//! Note that `CrateDefMap` contains fully macro expanded code.
9+
//! Note that `DefMap` contains fully macro expanded code.
1010
//!
11-
//! Computing `CrateDefMap` can be partitioned into several logically
11+
//! Computing `DefMap` can be partitioned into several logically
1212
//! independent "phases". The phases are mutually recursive though, there's no
1313
//! strict ordering.
1414
//!

crates/ide_db/src/symbol_index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ pub fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol> {
198198

199199
pub fn crate_symbols(db: &RootDatabase, krate: CrateId, query: Query) -> Vec<FileSymbol> {
200200
let _p = profile::span("crate_symbols").detail(|| format!("{:?}", query));
201-
// FIXME(#4842): This now depends on CrateDefMap, why not build the entire symbol index from
201+
// FIXME(#4842): This now depends on DefMap, why not build the entire symbol index from
202202
// that instead?
203203

204204
let def_map = db.crate_def_map(krate);

0 commit comments

Comments
 (0)