Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5715

Browse source 
5715: Simplify

 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-08-12 08:21:19 +00:00 committed by GitHub
commit b93408d0b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_parser/src/parser.rs
View file

@ -269,8 +269,8 @@ impl Marker {
pub(crate) fn complete(mut self, p: &mut Parser, kind: SyntaxKind) -> CompletedMarker { pub(crate) fn complete(mut self, p: &mut Parser, kind: SyntaxKind) -> CompletedMarker {
self.bomb.defuse(); self.bomb.defuse();
let idx = self.pos as usize; let idx = self.pos as usize;
match p.events[idx] { match &mut p.events[idx] {
Event::Start { kind: ref mut slot, .. } => { Event::Start { kind: slot, .. } => {
*slot = kind; *slot = kind;
} }
_ => unreachable!(), _ => unreachable!(),
@ -320,8 +320,8 @@ impl CompletedMarker {
pub(crate) fn precede(self, p: &mut Parser) -> Marker { pub(crate) fn precede(self, p: &mut Parser) -> Marker {
let new_pos = p.start(); let new_pos = p.start();
let idx = self.start_pos as usize; let idx = self.start_pos as usize;
match p.events[idx] { match &mut p.events[idx] {
Event::Start { ref mut forward_parent, .. } => { Event::Start { forward_parent, .. } => {
*forward_parent = Some(new_pos.pos - self.start_pos); *forward_parent = Some(new_pos.pos - self.start_pos);
} }
_ => unreachable!(), _ => unreachable!(),
@ -333,12 +333,12 @@ impl CompletedMarker {
pub(crate) fn undo_completion(self, p: &mut Parser) -> Marker { pub(crate) fn undo_completion(self, p: &mut Parser) -> Marker {
let start_idx = self.start_pos as usize; let start_idx = self.start_pos as usize;
let finish_idx = self.finish_pos as usize; let finish_idx = self.finish_pos as usize;
match p.events[start_idx] { match &mut p.events[start_idx] {
Event::Start { ref mut kind, forward_parent: None } => *kind = TOMBSTONE, Event::Start { kind, forward_parent: None } => *kind = TOMBSTONE,
_ => unreachable!(), _ => unreachable!(),
} }
match p.events[finish_idx] { match &mut p.events[finish_idx] {
ref mut slot @ Event::Finish => *slot = Event::tombstone(), slot @ Event::Finish => *slot = Event::tombstone(),
_ => unreachable!(), _ => unreachable!(),
} }
Marker::new(self.start_pos) Marker::new(self.start_pos)