diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-09 12:37:49 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-11-09 12:37:49 +0000 |
| commit | 9d786ea221b27fbdf7c7f7beea0290db448e0611 (patch) | |
| tree | 312ae071afe742011c1e396d63123729e31f9815 /crates/ra_hir/src/code_model | |
| parent | defc7ad772123a449f7cc384dd46d88c3a45fb53 (diff) | |
| parent | 6294fd5ec9c6946bdd91f1274956c573f9f2a136 (diff) | |
Merge #2198
2198: Unfork struct and union ids r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model')
| -rw-r--r-- | crates/ra_hir/src/code_model/src.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/code_model/src.rs b/crates/ra_hir/src/code_model/src.rs index 6d116ee75..247ae3e55 100644 --- a/crates/ra_hir/src/code_model/src.rs +++ b/crates/ra_hir/src/code_model/src.rs | |||
| @@ -78,13 +78,13 @@ impl HasSource for StructField { | |||
| 78 | impl HasSource for Struct { | 78 | impl HasSource for Struct { |
| 79 | type Ast = ast::StructDef; | 79 | type Ast = ast::StructDef; |
| 80 | fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { | 80 | fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { |
| 81 | self.id.source(db) | 81 | self.id.0.source(db) |
| 82 | } | 82 | } |
| 83 | } | 83 | } |
| 84 | impl HasSource for Union { | 84 | impl HasSource for Union { |
| 85 | type Ast = ast::StructDef; | 85 | type Ast = ast::StructDef; |
| 86 | fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { | 86 | fn source(self, db: &(impl DefDatabase + AstDatabase)) -> Source<ast::StructDef> { |
| 87 | self.id.source(db) | 87 | self.id.0.source(db) |
| 88 | } | 88 | } |
| 89 | } | 89 | } |
| 90 | impl HasSource for Enum { | 90 | impl HasSource for Enum { |