diff options
| author | Seivan Heidari <[email protected]> | 2019-11-09 15:27:40 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-09 15:27:40 +0000 |
| commit | 529b227d42951feabf64c8c964b00e726dd92d46 (patch) | |
| tree | d54ea1a30905d4fd8798129103bb13921fb55c94 /crates/ra_hir/src/code_model | |
| parent | 81662d23a64c7eb7ea10cb7bbf316f17d78dc4bc (diff) | |
| parent | 9d786ea221b27fbdf7c7f7beea0290db448e0611 (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
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 { |