1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs
index dfb79a30a..225638b42 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/ra_hir_def/src/body.rs
@@ -13,7 +13,7 @@ use ra_syntax::{ast, AstNode, AstPtr};
 use rustc_hash::FxHashMap;
 use crate::{
-    db::DefDatabase2,
+    db::DefDatabase,
    expr::{Expr, ExprId, Pat, PatId},
    nameres::CrateDefMap,
    path::Path,
@@ -28,7 +28,7 @@ pub struct Expander {
 }
 impl Expander {
-    pub fn new(db: &impl DefDatabase2, current_file_id: HirFileId, module: ModuleId) -> Expander {
+    pub fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander {
        let crate_def_map = db.crate_def_map(module.krate);
        let hygiene = Hygiene::new(db, current_file_id);
        Expander { crate_def_map, current_file_id, hygiene, module }
@@ -36,7 +36,7 @@ impl Expander {
    fn enter_expand(
        &mut self,
-        db: &impl DefDatabase2,
+        db: &impl DefDatabase,
        macro_call: ast::MacroCall,
    ) -> Option<(Mark, ast::Expr)> {
        let ast_id = AstId::new(
@@ -67,7 +67,7 @@ impl Expander {
        None
    }
-    fn exit(&mut self, db: &impl DefDatabase2, mark: Mark) {
+    fn exit(&mut self, db: &impl DefDatabase, mark: Mark) {
        self.hygiene = Hygiene::new(db, mark.file_id);
        self.current_file_id = mark.file_id;
        std::mem::forget(mark);
@@ -81,7 +81,7 @@ impl Expander {
        Path::from_src(path, &self.hygiene)
    }
-    fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> {
+    fn resolve_path_as_macro(&self, db: &impl DefDatabase, path: &Path) -> Option<MacroDefId> {
        self.crate_def_map.resolve_path(db, self.module.module_id, path).0.get_macros()
    }
 }
@@ -142,7 +142,7 @@ pub struct BodySourceMap {
 impl Body {
    pub(crate) fn body_with_source_map_query(
-        db: &impl DefDatabase2,
+        db: &impl DefDatabase,
        def: DefWithBodyId,
    ) -> (Arc<Body>, Arc<BodySourceMap>) {
        let mut params = None;
@@ -169,12 +169,12 @@ impl Body {
        (Arc::new(body), Arc::new(source_map))
    }
-    pub(crate) fn body_query(db: &impl DefDatabase2, def: DefWithBodyId) -> Arc<Body> {
+    pub(crate) fn body_query(db: &impl DefDatabase, def: DefWithBodyId) -> Arc<Body> {
        db.body_with_source_map(def).0
    }
    fn new(
-        db: &impl DefDatabase2,
+        db: &impl DefDatabase,
        expander: Expander,
        params: Option<ast::ParamList>,
        body: Option<ast::Expr>,

diff --git a/crates/ra_hir_def/src/body.rs b/crates/ra_hir_def/src/body.rs index dfb79a30a..225638b42 100644 --- a/crates/ra_hir_def/src/body.rs +++ b/crates/ra_hir_def/src/body.rs
@@ -13,7 +13,7 @@ use ra_syntax::{ast, AstNode, AstPtr};
13	use rustc_hash::FxHashMap;	13	use rustc_hash::FxHashMap;
14		14
15	use crate::{	15	use crate::{
16	db::DefDatabase2,	16	db::DefDatabase,
17	expr::{Expr, ExprId, Pat, PatId},	17	expr::{Expr, ExprId, Pat, PatId},
18	nameres::CrateDefMap,	18	nameres::CrateDefMap,
19	path::Path,	19	path::Path,
@@ -28,7 +28,7 @@ pub struct Expander {
28	}	28	}
29		29
30	impl Expander {	30	impl Expander {
31	pub fn new(db: &impl DefDatabase2, current_file_id: HirFileId, module: ModuleId) -> Expander {	31	pub fn new(db: &impl DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander {
32	let crate_def_map = db.crate_def_map(module.krate);	32	let crate_def_map = db.crate_def_map(module.krate);
33	let hygiene = Hygiene::new(db, current_file_id);	33	let hygiene = Hygiene::new(db, current_file_id);
34	Expander { crate_def_map, current_file_id, hygiene, module }	34	Expander { crate_def_map, current_file_id, hygiene, module }
@@ -36,7 +36,7 @@ impl Expander {
36		36
37	fn enter_expand(	37	fn enter_expand(
38	&mut self,	38	&mut self,
39	db: &impl DefDatabase2,	39	db: &impl DefDatabase,
40	macro_call: ast::MacroCall,	40	macro_call: ast::MacroCall,
41	) -> Option<(Mark, ast::Expr)> {	41	) -> Option<(Mark, ast::Expr)> {
42	let ast_id = AstId::new(	42	let ast_id = AstId::new(
@@ -67,7 +67,7 @@ impl Expander {
67	None	67	None
68	}	68	}
69		69
70	fn exit(&mut self, db: &impl DefDatabase2, mark: Mark) {	70	fn exit(&mut self, db: &impl DefDatabase, mark: Mark) {
71	self.hygiene = Hygiene::new(db, mark.file_id);	71	self.hygiene = Hygiene::new(db, mark.file_id);
72	self.current_file_id = mark.file_id;	72	self.current_file_id = mark.file_id;
73	std::mem::forget(mark);	73	std::mem::forget(mark);
@@ -81,7 +81,7 @@ impl Expander {
81	Path::from_src(path, &self.hygiene)	81	Path::from_src(path, &self.hygiene)
82	}	82	}
83		83
84	fn resolve_path_as_macro(&self, db: &impl DefDatabase2, path: &Path) -> Option<MacroDefId> {	84	fn resolve_path_as_macro(&self, db: &impl DefDatabase, path: &Path) -> Option<MacroDefId> {
85	self.crate_def_map.resolve_path(db, self.module.module_id, path).0.get_macros()	85	self.crate_def_map.resolve_path(db, self.module.module_id, path).0.get_macros()
86	}	86	}
87	}	87	}
@@ -142,7 +142,7 @@ pub struct BodySourceMap {
142		142
143	impl Body {	143	impl Body {
144	pub(crate) fn body_with_source_map_query(	144	pub(crate) fn body_with_source_map_query(
145	db: &impl DefDatabase2,	145	db: &impl DefDatabase,
146	def: DefWithBodyId,	146	def: DefWithBodyId,
147	) -> (Arc<Body>, Arc<BodySourceMap>) {	147	) -> (Arc<Body>, Arc<BodySourceMap>) {
148	let mut params = None;	148	let mut params = None;
@@ -169,12 +169,12 @@ impl Body {
169	(Arc::new(body), Arc::new(source_map))	169	(Arc::new(body), Arc::new(source_map))
170	}	170	}
171		171
172	pub(crate) fn body_query(db: &impl DefDatabase2, def: DefWithBodyId) -> Arc<Body> {	172	pub(crate) fn body_query(db: &impl DefDatabase, def: DefWithBodyId) -> Arc<Body> {
173	db.body_with_source_map(def).0	173	db.body_with_source_map(def).0
174	}	174	}
175		175
176	fn new(	176	fn new(
177	db: &impl DefDatabase2,	177	db: &impl DefDatabase,
178	expander: Expander,	178	expander: Expander,
179	params: Option<ast::ParamList>,	179	params: Option<ast::ParamList>,
180	body: Option<ast::Expr>,	180	body: Option<ast::Expr>,