Merge #3379

3379: Rename ast::ImplBlock -> ast::ImplDef r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 4 insertions, 4 deletions

diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index 5afb23764..4d3dd477e 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -269,7 +269,7 @@ impl ToNav for hir::Module {
     }
 }
 
-impl ToNav for hir::ImplBlock {
+impl ToNav for hir::ImplDef {
     fn to_nav(&self, db: &RootDatabase) -> NavigationTarget {
         let src = self.source(db);
         let frange = if let Some(item) = self.is_builtin_derive(db) {
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs
index 944cc79df..5774e9a8b 100644
--- a/crates/ra_ide/src/display/structure.rs
+++ b/crates/ra_ide/src/display/structure.rs
@@ -129,7 +129,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> {
             ast::RecordFieldDef(it) => { decl_with_ascription(it) },
             ast::ConstDef(it) => { decl_with_ascription(it) },
             ast::StaticDef(it) => { decl_with_ascription(it) },
-            ast::ImplBlock(it) => {
+            ast::ImplDef(it) => {
                 let target_type = it.target_type()?;
                 let target_trait = it.target_trait();
                 let label = match target_trait {
@@ -360,7 +360,7 @@ fn very_obsolete() {}
                 label: "impl E",
                 navigation_range: [239; 240),
                 node_range: [234; 243),
-                kind: IMPL_BLOCK,
+                kind: IMPL_DEF,
                 detail: None,
                 deprecated: false,
             },
@@ -369,7 +369,7 @@ fn very_obsolete() {}
                 label: "impl fmt::Debug for E",
                 navigation_range: [265; 266),
                 node_range: [245; 269),
-                kind: IMPL_BLOCK,
+                kind: IMPL_DEF,
                 detail: None,
                 deprecated: false,
             },