Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 15:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Access a body's block def maps via a method

Browse Source
This commit is contained in:
Jonas Schievink
2021-04-04 03:03:18 +02:00
parent 234ddf34c7
commit d8bf9bef80
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/hir_def/src/body.rs
+11 -1
View File
@@ -226,7 +226,7 @@ pub struct Body {
/// The `ExprId` of the actual body expression.
pub body_expr: ExprId,
/// Block expressions in this body that may contain inner items.
pub block_scopes: Vec<BlockId>,
block_scopes: Vec<BlockId>,
_c: Count<Self>,
}
@@ -310,6 +310,16 @@ pub(crate) fn body_query(db: &dyn DefDatabase, def: DefWithBodyId) -> Arc<Body>
db.body_with_source_map(def).0
}
/// Returns an iterator over all block expressions in this body that define inner items.
pub fn blocks<'a>(
&'a self,
db: &'a dyn DefDatabase,
) -> impl Iterator<Item = (BlockId, Arc<DefMap>)> + '_ {
self.block_scopes
.iter()
.filter_map(move |block| db.block_def_map(*block).map(|map| (*block, map)))
}
fn new(
db: &dyn DefDatabase,
expander: Expander,
crates/hir_def/src/child_by_source.rs
+1 -1
View File
@@ -160,7 +160,7 @@ fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap) {
impl ChildBySource for DefWithBodyId {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap) {
let body = db.body(*self);
for def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) {
for (_, def_map) in body.blocks(db) {
// All block expressions are merged into the same map, because they logically all add
// inner items to the containing `DefWithBodyId`.
def_map[def_map.root()].scope.child_by_source_to(db, res);
crates/hir_ty/src/diagnostics/decl_check.rs
+1 -2
View File
@@ -99,8 +99,7 @@ fn validate_func(&mut self, func: FunctionId) {
let body = self.db.body(func.into());
// Recursively validate inner scope items, such as static variables and constants.
let db = self.db;
for block_def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) {
for (_, block_def_map) in body.blocks(self.db.upcast()) {
for (_, module) in block_def_map.modules() {
for def_id in module.scope.declarations() {
let mut validator = DeclValidator::new(self.db, self.krate, self.sink);
crates/hir_ty/src/tests.rs
+1 -1
View File
@@ -288,7 +288,7 @@ fn visit_scope(
}
fn visit_body(db: &TestDB, body: &Body, cb: &mut dyn FnMut(DefWithBodyId)) {
for def_map in body.block_scopes.iter().filter_map(|block| db.block_def_map(*block)) {
for (_, def_map) in body.blocks(db) {
for (mod_id, _) in def_map.modules() {
visit_module(db, &def_map, mod_id, cb);
}