Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #10155

Browse source 
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 [57a82fb0](https://github.com/rust-analyzer/rust-analyzer/commit/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 <toyboot4e@gmail.com>
This commit is contained in:
bors[bot] 2021-09-05 16:57:46 +00:00 committed by GitHub
commit 487078feb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/hir_def/src/nameres.rs
View file

@ -1,14 +1,14 @@
//! This module implements import-resolution/macro expansion algorithm. //! This module implements import-resolution/macro expansion algorithm.
//! //!
//! The result of this module is `CrateDefMap`: a data structure which contains: //! The result of this module is `DefMap`: a data structure which contains:
//! //!
//! * a tree of modules for the crate //! * a tree of modules for the crate
//! * for each module, a set of items visible in the module (directly declared //! * for each module, a set of items visible in the module (directly declared
//! or imported) //! or imported)
//! //!
//! Note that `CrateDefMap` contains fully macro expanded code. //! Note that `DefMap` contains fully macro expanded code.
//! //!
//! Computing `CrateDefMap` can be partitioned into several logically //! Computing `DefMap` can be partitioned into several logically
//! independent "phases". The phases are mutually recursive though, there's no //! independent "phases". The phases are mutually recursive though, there's no
//! strict ordering. //! strict ordering.
//! //!

2
crates/ide_db/src/symbol_index.rs
View file

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