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

Simplify

Browse source
This commit is contained in:
kjeremy 2019-04-26 11:42:56 -04:00
parent 4251f083b5
commit d8649c1af8
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ra_parser/src/grammar/expressions.rs
View file

@ -252,12 +252,12 @@ fn expr_bp(
// `newly_dollar_open` is a flag indicated that dollar is just closed after lhs, e.g. // `newly_dollar_open` is a flag indicated that dollar is just closed after lhs, e.g.
// `$1$ + a` // `$1$ + a`
// We use this flag to skip handling it. // We use this flag to skip handling it.
let mut newly_dollar_open = false; let mut newly_dollar_open = if p.at_l_dollar() {
if p.at_l_dollar() {
*dollar_lvl += p.eat_l_dollars(); *dollar_lvl += p.eat_l_dollars();
newly_dollar_open = true; true
} } else {
false
};
let mut lhs = match lhs(p, r, dollar_lvl) { let mut lhs = match lhs(p, r, dollar_lvl) {
Some((lhs, blocklike)) => { Some((lhs, blocklike)) => {
@ -535,7 +535,7 @@ fn path_expr(p: &mut Parser, r: Restrictions) -> (CompletedMarker, BlockLike) {
} }
EXCL => { EXCL => {
let block_like = items::macro_call_after_excl(p); let block_like = items::macro_call_after_excl(p);
return (m.complete(p, MACRO_CALL), block_like); (m.complete(p, MACRO_CALL), block_like)
} }
_ => (m.complete(p, PATH_EXPR), BlockLike::NotBlock), _ => (m.complete(p, PATH_EXPR), BlockLike::NotBlock),
} }

11
crates/ra_prof/src/lib.rs
View file

@ -67,14 +67,11 @@ pub fn profile(desc: &str) -> Profiler {
PROFILE_STACK.with(|stack| { PROFILE_STACK.with(|stack| {
let mut stack = stack.borrow_mut(); let mut stack = stack.borrow_mut();
if stack.starts.len() == 0 { if stack.starts.is_empty() {
match FILTER.try_read() { if let Ok(f) = FILTER.try_read() {
Ok(f) => { if f.version > stack.filter_data.version {
if f.version > stack.filter_data.version { stack.filter_data = f.clone();
stack.filter_data = f.clone();
}
} }
Err(_) => (),
}; };
} }