From fc1e543f7abb69b8cab308410fa0a127950ee1c5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 23 Nov 2019 14:44:43 +0300 Subject: Get rid of DefDatabase2 --- crates/ra_hir_def/src/attr.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_hir_def/src/attr.rs') diff --git a/crates/ra_hir_def/src/attr.rs b/crates/ra_hir_def/src/attr.rs index eee5e44bf..48ce8cd93 100644 --- a/crates/ra_hir_def/src/attr.rs +++ b/crates/ra_hir_def/src/attr.rs @@ -12,7 +12,7 @@ use ra_syntax::{ use tt::Subtree; use crate::{ - db::DefDatabase2, path::Path, AdtId, AstItemDef, AttrDefId, HasChildSource, HasSource, Lookup, + db::DefDatabase, path::Path, AdtId, AstItemDef, AttrDefId, HasChildSource, HasSource, Lookup, }; #[derive(Default, Debug, Clone, PartialEq, Eq)] @@ -32,7 +32,7 @@ impl ops::Deref for Attrs { } impl Attrs { - pub(crate) fn attrs_query(db: &impl DefDatabase2, def: AttrDefId) -> Attrs { + pub(crate) fn attrs_query(db: &impl DefDatabase, def: AttrDefId) -> Attrs { match def { AttrDefId::ModuleId(module) => { let def_map = db.crate_def_map(module.krate); @@ -162,7 +162,7 @@ impl Attr { fn attrs_from_ast(src: AstId, db: &D) -> Attrs where N: ast::AttrsOwner, - D: DefDatabase2, + D: DefDatabase, { let hygiene = Hygiene::new(db, src.file_id()); Attr::from_attrs_owner(&src.to_node(db), &hygiene) @@ -172,7 +172,7 @@ fn attrs_from_loc(node: T, db: &D) -> Attrs where T: HasSource, T::Value: ast::AttrsOwner, - D: DefDatabase2, + D: DefDatabase, { let src = node.source(db); let hygiene = Hygiene::new(db, src.file_id); -- cgit v1.2.3