diff options
author | Seivan Heidari <[email protected]> | 2019-11-18 19:53:40 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-11-18 19:53:40 +0000 |
commit | 4bdb6351ac557851607df9d142c9e573c0fb5e1d (patch) | |
tree | 48b349958afceeeebecccd63e55004d5a924baff /crates/ra_syntax/src/ast | |
parent | aceeb0b85ee8228503f970ea602af71ff22216a0 (diff) | |
parent | a4f21801c54c65eafa337edc5e86de2c46b37544 (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_syntax/src/ast')
-rw-r--r-- | crates/ra_syntax/src/ast/extensions.rs | 12 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/generated.rs | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/crates/ra_syntax/src/ast/extensions.rs b/crates/ra_syntax/src/ast/extensions.rs index cefc00402..761b2435c 100644 --- a/crates/ra_syntax/src/ast/extensions.rs +++ b/crates/ra_syntax/src/ast/extensions.rs | |||
@@ -2,7 +2,7 @@ | |||
2 | //! Extensions for various expressions live in a sibling `expr_extensions` module. | 2 | //! Extensions for various expressions live in a sibling `expr_extensions` module. |
3 | 3 | ||
4 | use crate::{ | 4 | use crate::{ |
5 | ast::{self, child_opt, children, AstChildren, AstNode, AttrInput, SyntaxNode}, | 5 | ast::{self, child_opt, children, AstNode, AttrInput, SyntaxNode}, |
6 | SmolStr, SyntaxElement, | 6 | SmolStr, SyntaxElement, |
7 | SyntaxKind::*, | 7 | SyntaxKind::*, |
8 | SyntaxToken, T, | 8 | SyntaxToken, T, |
@@ -176,16 +176,6 @@ impl ast::ImplBlock { | |||
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | impl ast::AttrsOwner for ast::ImplItem { | ||
180 | fn attrs(&self) -> AstChildren<ast::Attr> { | ||
181 | match self { | ||
182 | ast::ImplItem::FnDef(it) => it.attrs(), | ||
183 | ast::ImplItem::TypeAliasDef(it) => it.attrs(), | ||
184 | ast::ImplItem::ConstDef(it) => it.attrs(), | ||
185 | } | ||
186 | } | ||
187 | } | ||
188 | |||
189 | #[derive(Debug, Clone, PartialEq, Eq)] | 179 | #[derive(Debug, Clone, PartialEq, Eq)] |
190 | pub enum StructKind { | 180 | pub enum StructKind { |
191 | Tuple(ast::TupleFieldDefList), | 181 | Tuple(ast::TupleFieldDefList), |
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs index 34b22c3e2..2b381dcdb 100644 --- a/crates/ra_syntax/src/ast/generated.rs +++ b/crates/ra_syntax/src/ast/generated.rs | |||
@@ -1298,6 +1298,7 @@ impl AstNode for ImplItem { | |||
1298 | } | 1298 | } |
1299 | } | 1299 | } |
1300 | } | 1300 | } |
1301 | impl ast::AttrsOwner for ImplItem {} | ||
1301 | impl ImplItem {} | 1302 | impl ImplItem {} |
1302 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 1303 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
1303 | pub struct ImplTraitType { | 1304 | pub struct ImplTraitType { |