Small improvements from review comments

diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 842f54f110a74a3d03f1fb7973c33fc260fa5568..fd6336dd8c9788c2f20477d3d33e52d73209641b 100644 (file)
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -104,7 +104,7 @@ fn impls_in_module(source_root_id: SourceRootId, module_id: ModuleId) -> Cancela
 
     fn impls_in_crate(krate: Crate) -> Cancelable<Arc<CrateImplBlocks>> {
         type ImplsInCrateQuery;
-        use fn crate::ty::method_resolution::impls_in_crate;
+        use fn crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query;
     }
 
     fn body_hir(def_id: DefId) -> Cancelable<Arc<crate::expr::Body>> {

diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs
index 23c1d98d5c91921cbfea951386a4192029a3cbb6..d0b08630810eaa9b7591e3b9abf1505279bdda7e 100644 (file)
--- a/crates/ra_hir/src/impl_block.rs
+++ b/crates/ra_hir/src/impl_block.rs
@@ -170,10 +170,10 @@ fn collect(&mut self, db: &impl HirDatabase, module: Module) -> Cancelable<()> {
         let (file_id, module_source) = module.definition_source(db)?;
         let node = match &module_source {
             ModuleSource::SourceFile(node) => node.syntax(),
-            ModuleSource::Module(node) => match node.item_list() {
-                Some(item_list) => item_list.syntax(),
-                None => return Ok(()),
-            },
+            ModuleSource::Module(node) => node
+                .item_list()
+                .expect("inline module should have item list")
+                .syntax(),
         };
 
         let source_file_items = db.file_items(file_id.into());

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index ad80aa8b6ad6b69bba60287bf17a37006d067dba..1330d03a809e4e1cf0979fef233ca55cc49eb608 100644 (file)
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -81,23 +81,23 @@ fn collect_recursive(&mut self, db: &impl HirDatabase, module: Module) -> Cancel
 
         Ok(())
     }
-}
 
-pub(crate) fn impls_in_crate(
-    db: &impl HirDatabase,
-    krate: Crate,
-) -> Cancelable<Arc<CrateImplBlocks>> {
-    let crate_graph = db.crate_graph();
-    let file_id = crate_graph.crate_root(krate.crate_id);
-    let source_root_id = db.file_source_root(file_id);
-    let mut crate_impl_blocks = CrateImplBlocks {
-        source_root_id,
-        impls: FxHashMap::default(),
-    };
-    if let Some(module) = krate.root_module(db)? {
-        crate_impl_blocks.collect_recursive(db, module)?;
+    pub(crate) fn impls_in_crate_query(
+        db: &impl HirDatabase,
+        krate: Crate,
+    ) -> Cancelable<Arc<CrateImplBlocks>> {
+        let crate_graph = db.crate_graph();
+        let file_id = crate_graph.crate_root(krate.crate_id);
+        let source_root_id = db.file_source_root(file_id);
+        let mut crate_impl_blocks = CrateImplBlocks {
+            source_root_id,
+            impls: FxHashMap::default(),
+        };
+        if let Some(module) = krate.root_module(db)? {
+            crate_impl_blocks.collect_recursive(db, module)?;
+        }
+        Ok(Arc::new(crate_impl_blocks))
     }
-    Ok(Arc::new(crate_impl_blocks))
 }
 
 fn def_crate(db: &impl HirDatabase, ty: &Ty) -> Cancelable<Option<Crate>> {