language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-18 08:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

remove flavor

Browse source
This commit is contained in:
Aleksey Kladov 2019-04-02 12:25:24 +03:00
parent 5287a2506c
commit f3a82c372c
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ra_syntax/src/ast.rs
View file

@ -164,7 +164,7 @@ impl LetStmt {
}
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ElseBranchFlavor<'a> {
pub enum ElseBranch<'a> {
Block(&'a Block),
IfExpr(&'a IfExpr),
}
@ -173,12 +173,12 @@ impl IfExpr {
pub fn then_branch(&self) -> Option<&Block> {
self.blocks().nth(0)
}
pub fn else_branch(&self) -> Option<ElseBranchFlavor> {
pub fn else_branch(&self) -> Option<ElseBranch> {
let res = match self.blocks().nth(1) {
Some(block) => ElseBranchFlavor::Block(block),
Some(block) => ElseBranch::Block(block),
None => {
let elif: &IfExpr = child_opt(self)?;
ElseBranchFlavor::IfExpr(elif)
ElseBranch::IfExpr(elif)
}
};
Some(res)