diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-02 17:46:10 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-02 17:46:10 +0100 |
commit | a8397deab914240aca8f015fb3736689919c0a5b (patch) | |
tree | 0afdeb58c88c4d63426355e344f2b1a8fc46f613 /crates/ra_syntax/src | |
parent | 8de2fb37c045a4f4fc6dd1f49bd3b0157182086c (diff) | |
parent | f377b94628a265cb5335fbe4594a47cc8ddc9e2c (diff) |
Merge #1751
1751: remove useless trait r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/src')
-rw-r--r-- | crates/ra_syntax/src/ast/generated.rs | 7 | ||||
-rw-r--r-- | crates/ra_syntax/src/ast/traits.rs | 6 | ||||
-rw-r--r-- | crates/ra_syntax/src/grammar.ron | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs index 90480b6ca..7f91417c5 100644 --- a/crates/ra_syntax/src/ast/generated.rs +++ b/crates/ra_syntax/src/ast/generated.rs | |||
@@ -3134,8 +3134,11 @@ impl AstNode for TryBlockExpr { | |||
3134 | &self.syntax | 3134 | &self.syntax |
3135 | } | 3135 | } |
3136 | } | 3136 | } |
3137 | impl ast::TryBlockBodyOwner for TryBlockExpr {} | 3137 | impl TryBlockExpr { |
3138 | impl TryBlockExpr {} | 3138 | pub fn block(&self) -> Option<Block> { |
3139 | AstChildren::new(&self.syntax).next() | ||
3140 | } | ||
3141 | } | ||
3139 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 3142 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] |
3140 | pub struct TryExpr { | 3143 | pub struct TryExpr { |
3141 | pub(crate) syntax: SyntaxNode, | 3144 | pub(crate) syntax: SyntaxNode, |
diff --git a/crates/ra_syntax/src/ast/traits.rs b/crates/ra_syntax/src/ast/traits.rs index 1b9a2b20c..20c251fba 100644 --- a/crates/ra_syntax/src/ast/traits.rs +++ b/crates/ra_syntax/src/ast/traits.rs | |||
@@ -33,12 +33,6 @@ pub trait LoopBodyOwner: AstNode { | |||
33 | } | 33 | } |
34 | } | 34 | } |
35 | 35 | ||
36 | pub trait TryBlockBodyOwner: AstNode { | ||
37 | fn try_body(&self) -> Option<ast::Block> { | ||
38 | child_opt(self) | ||
39 | } | ||
40 | } | ||
41 | |||
42 | pub trait ArgListOwner: AstNode { | 36 | pub trait ArgListOwner: AstNode { |
43 | fn arg_list(&self) -> Option<ast::ArgList> { | 37 | fn arg_list(&self) -> Option<ast::ArgList> { |
44 | child_opt(self) | 38 | child_opt(self) |
diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index 1836862fe..9f17a10ed 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron | |||
@@ -426,7 +426,7 @@ Grammar( | |||
426 | traits: ["LoopBodyOwner"], | 426 | traits: ["LoopBodyOwner"], |
427 | ), | 427 | ), |
428 | "TryBlockExpr": ( | 428 | "TryBlockExpr": ( |
429 | traits: ["TryBlockBodyOwner"], | 429 | options: ["Block"], |
430 | ), | 430 | ), |
431 | "ForExpr": ( | 431 | "ForExpr": ( |
432 | traits: ["LoopBodyOwner"], | 432 | traits: ["LoopBodyOwner"], |