rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Aleksey Kladov
2019-03-25 10:59:42 +03:00
parent 6f995f47ea
commit 6c4b06e2e3
1 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ra_syntax/src/ast.rs
View File

@@ -603,9 +603,7 @@ pub enum BinOp {
impl BinExpr { impl BinExpr {
fn op_details(&self) -> Option<(&SyntaxNode, BinOp)> { fn op_details(&self) -> Option<(&SyntaxNode, BinOp)> {
self.syntax() self.syntax().children().find_map(|c| match c.kind() {
.children()
.filter_map(|c| match c.kind() {
PIPEPIPE => Some((c, BinOp::BooleanOr)), PIPEPIPE => Some((c, BinOp::BooleanOr)),
AMPAMP => Some((c, BinOp::BooleanAnd)), AMPAMP => Some((c, BinOp::BooleanAnd)),
EQEQ => Some((c, BinOp::EqualityTest)), EQEQ => Some((c, BinOp::EqualityTest)),
@@ -639,7 +637,6 @@ impl BinExpr {
CARETEQ => Some((c, BinOp::BitXorAssign)), CARETEQ => Some((c, BinOp::BitXorAssign)),
_ => None, _ => None,
}) })
.next()
} }
pub fn op_kind(&self) -> Option<BinOp> { pub fn op_kind(&self) -> Option<BinOp> {