From f377b94628a265cb5335fbe4594a47cc8ddc9e2c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 2 Sep 2019 19:45:41 +0300 Subject: remove useless trait --- crates/ra_syntax/src/ast/generated.rs | 7 +++++-- crates/ra_syntax/src/ast/traits.rs | 6 ------ crates/ra_syntax/src/grammar.ron | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'crates/ra_syntax/src') 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 { &self.syntax } } -impl ast::TryBlockBodyOwner for TryBlockExpr {} -impl TryBlockExpr {} +impl TryBlockExpr { + pub fn block(&self) -> Option { + AstChildren::new(&self.syntax).next() + } +} #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct TryExpr { 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 { } } -pub trait TryBlockBodyOwner: AstNode { - fn try_body(&self) -> Option { - child_opt(self) - } -} - pub trait ArgListOwner: AstNode { fn arg_list(&self) -> Option { 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( traits: ["LoopBodyOwner"], ), "TryBlockExpr": ( - traits: ["TryBlockBodyOwner"], + options: ["Block"], ), "ForExpr": ( traits: ["LoopBodyOwner"], -- cgit v1.2.3