Merge pull request rust-lang#22745 from ada4a/unquerygroup-defdatabase

internal: remove `DefDatabase`

Author: Veykril

Cargo.lock

@@ -29,7 +29,6 @@ triomphe.workspace = true
 rustc_apfloat = "0.2.3"
 salsa.workspace = true
 salsa-macros.workspace = true
-query-group.workspace = true
 
 ra-ap-rustc_parse_format.workspace = true
 ra-ap-rustc_abi.workspace = true

crates/hir-def/Cargo.toml

@@ -11,7 +11,7 @@ use std::{
     ops::{ControlFlow, Range},
 };
 
-use base_db::Crate;
+use base_db::{Crate, SourceDatabase};
 use cfg::CfgOptions;
 use either::Either;
 use hir_expand::{
@@ -27,7 +27,7 @@ use syntax::{
 };
 use tt::{TextRange, TextSize};
 
-use crate::{db::DefDatabase, macro_call_as_call_id, nameres::MacroSubNs, resolver::Resolver};
+use crate::{macro_call_as_call_id, nameres::MacroSubNs, resolver::Resolver};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub(crate) struct DocsSourceMapLine {
@@ -323,7 +323,7 @@ impl Docs {
 }
 
 struct DocMacroExpander<'db> {
-    db: &'db dyn DefDatabase,
+    db: &'db dyn SourceDatabase,
     krate: Crate,
     recursion_depth: usize,
     recursion_limit: usize,
@@ -408,7 +408,7 @@ fn expand_doc_macro_call<'db>(
 
 fn extend_with_attrs<'a, 'db>(
     result: &mut Docs,
-    db: &'db dyn DefDatabase,
+    db: &'db dyn SourceDatabase,
     krate: Crate,
     node: &SyntaxNode,
     file_id: HirFileId,
@@ -473,7 +473,7 @@ fn extend_with_attrs<'a, 'db>(
 }
 
 pub(crate) fn extract_docs<'a, 'db>(
-    db: &'db dyn DefDatabase,
+    db: &'db dyn SourceDatabase,
     krate: Crate,
     resolver: &dyn Fn() -> Resolver<'db>,
     get_cfg_options: &dyn Fn() -> &'a CfgOptions,

crates/hir-def/src/attrs.rs

@@ -3,13 +3,14 @@
 //! To save time and memory, builtin derives are not really expanded. Instead, we record them
 //! and create their impls based on lowered data, see crates/hir-ty/src/builtin_derive.rs.
 
+use base_db::SourceDatabase;
 use hir_expand::{InFile, builtin::BuiltinDeriveExpander, name::Name};
 use intern::{Symbol, sym};
 use tt::TextRange;
 
 use crate::{
     AdtId, BuiltinDeriveImplId, BuiltinDeriveImplLoc, FunctionId, HasModule, MacroId,
-    db::DefDatabase, lang_item::LangItems,
+    lang_item::LangItems,
 };
 
 macro_rules! declare_enum {
@@ -109,7 +110,7 @@ impl BuiltinDeriveImplTrait {
 impl BuiltinDeriveImplMethod {
     pub fn trait_method(
         self,
-        db: &dyn DefDatabase,
+        db: &dyn SourceDatabase,
         impl_: BuiltinDeriveImplId,
     ) -> Option<FunctionId> {
         let loc = impl_.loc(db);
@@ -143,7 +144,7 @@ pub(crate) fn with_derive_traits(
 }
 
 impl BuiltinDeriveImplLoc {
-    pub fn source(&self, db: &dyn DefDatabase) -> InFile<TextRange> {
+    pub fn source(&self, db: &dyn SourceDatabase) -> InFile<TextRange> {
         let (adt_ast_id, module) = match self.adt {
             AdtId::StructId(adt) => {
                 let adt_loc = adt.loc(db);

crates/hir-def/src/attrs/docs.rs

@@ -14,6 +14,7 @@ use std::{
     ops::{Deref, Index},
 };
 
+use base_db::SourceDatabase;
 use cfg::{CfgExpr, CfgOptions};
 use either::Either;
 use hir_expand::{InFile, MacroCallId, mod_path::ModPath, name::Name};
@@ -27,7 +28,6 @@ use tt::TextRange;
 
 use crate::{
     AdtId, BlockId, ExpressionStoreOwnerId, GenericDefId, SyntheticSyntax,
-    db::DefDatabase,
     expr_store::path::{AssociatedTypeBinding, GenericArg, GenericArgs, NormalPath, Path},
     hir::{
         Array, AsmOperand, Binding, BindingId, Expr, ExprId, ExprOrPatId, InlineAsm, Label,
@@ -466,7 +466,7 @@ impl ExpressionStore {
         ExpressionStore::EMPTY
     }
 
-    pub fn of(db: &dyn DefDatabase, def: ExpressionStoreOwnerId) -> &ExpressionStore {
+    pub fn of(db: &dyn SourceDatabase, def: ExpressionStoreOwnerId) -> &ExpressionStore {
         match def {
             ExpressionStoreOwnerId::Signature(def) => {
                 use crate::signatures::{
@@ -494,7 +494,7 @@ impl ExpressionStore {
     }
 
     pub fn with_source_map(
-        db: &dyn DefDatabase,
+        db: &dyn SourceDatabase,
         def: ExpressionStoreOwnerId,
     ) -> (&ExpressionStore, &ExpressionStoreSourceMap) {
         match def {
@@ -589,7 +589,7 @@ impl ExpressionStore {
     /// Returns an iterator over all block expressions in this store that define inner items.
     pub fn blocks<'a>(
         &'a self,
-        db: &'a dyn DefDatabase,
+        db: &'a dyn SourceDatabase,
     ) -> impl Iterator<Item = (BlockId, &'a DefMap)> + 'a {
         self.expr_only
             .as_ref()

crates/hir-def/src/builtin_derive.rs

@@ -2,14 +2,14 @@
 //! consts.
 use std::ops;
 
+use base_db::SourceDatabase;
 use hir_expand::{InFile, Lookup};
 use span::Edition;
 use syntax::ast;
 use triomphe::Arc;
 
 use crate::{
     DefWithBodyId, ExpressionStoreOwnerId, HasModule,
-    db::DefDatabase,
     expr_store::{
         ExpressionStore, ExpressionStoreSourceMap, SelfParamPtr, lower::lower_body, pretty,
     },
@@ -87,7 +87,10 @@ impl ops::Deref for BodySourceMap {
 #[salsa::tracked]
 impl Body {
     #[salsa::tracked(lru = 512, returns(ref))]
-    pub fn with_source_map(db: &dyn DefDatabase, def: DefWithBodyId) -> (Arc<Body>, BodySourceMap) {
+    pub fn with_source_map(
+        db: &dyn SourceDatabase,
+        def: DefWithBodyId,
+    ) -> (Arc<Body>, BodySourceMap) {
         let _p = tracing::info_span!("body_with_source_map_query").entered();
         let mut params = None;
 
@@ -128,7 +131,7 @@ impl Body {
     }
 
     #[salsa::tracked(returns(deref))]
-    pub fn of(db: &dyn DefDatabase, def: DefWithBodyId) -> Arc<Body> {
+    pub fn of(db: &dyn SourceDatabase, def: DefWithBodyId) -> Arc<Body> {
         Self::with_source_map(db, def).0.clone()
     }
 }
@@ -150,7 +153,7 @@ impl Body {
 
     pub fn pretty_print(
         &self,
-        db: &dyn DefDatabase,
+        db: &dyn SourceDatabase,
         owner: DefWithBodyId,
         edition: Edition,
     ) -> String {
@@ -159,7 +162,7 @@ impl Body {
 
     pub fn pretty_print_expr(
         &self,
-        db: &dyn DefDatabase,
+        db: &dyn SourceDatabase,
         owner: DefWithBodyId,
         expr: ExprId,
         edition: Edition,
@@ -169,7 +172,7 @@ impl Body {
 
     pub fn pretty_print_pat(
         &self,
-        db: &dyn DefDatabase,
+        db: &dyn SourceDatabase,
         owner: ExpressionStoreOwnerId,
         pat: PatId,
         oneline: bool,