language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Avoid cloning a TtToken in SubtreeTokenSource::mk_token

Browse source
This commit is contained in:
Laurențiu Nicola 2019-08-03 21:11:58 +03:00
parent 0ca30b6c4b
commit e58baaa5a1
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/ra_mbe/src/subtree_source.rs
View file

@ -20,8 +20,10 @@ impl<'a> SubtreeTokenSource<'a> {
// Helper function used in test // Helper function used in test
#[cfg(test)] #[cfg(test)]
pub fn text(&self) -> SmolStr { pub fn text(&self) -> SmolStr {
match self.get(self.curr.1) { let idx = self.get(self.curr.1);
Some(tt) => tt.text, let cached = self.cached.borrow();
match cached[idx] {
Some(ref tt) => tt.text.clone(),
_ => SmolStr::new(""), _ => SmolStr::new(""),
} }
} }
@ -41,16 +43,18 @@ impl<'a> SubtreeTokenSource<'a> {
} }
fn mk_token(&self, pos: usize) -> Token { fn mk_token(&self, pos: usize) -> Token {
match self.get(pos) { let idx = self.get(pos);
Some(tt) => Token { kind: tt.kind, is_jointed_to_next: tt.is_joint_to_next }, let cached = self.cached.borrow();
match cached[idx] {
Some(ref tt) => Token { kind: tt.kind, is_jointed_to_next: tt.is_joint_to_next },
None => Token { kind: EOF, is_jointed_to_next: false }, None => Token { kind: EOF, is_jointed_to_next: false },
} }
} }
fn get(&self, pos: usize) -> Option<TtToken> { fn get(&self, pos: usize) -> usize {
let mut cached = self.cached.borrow_mut(); let mut cached = self.cached.borrow_mut();
if pos < cached.len() { if pos < cached.len() {
return cached[pos].clone(); return pos;
} }
while pos >= cached.len() { while pos >= cached.len() {
@ -78,7 +82,7 @@ impl<'a> SubtreeTokenSource<'a> {
} }
} }
cached[pos].clone() pos
} }
} }
@ -103,8 +107,10 @@ impl<'a> TokenSource for SubtreeTokenSource<'a> {
/// Is the current token a specified keyword? /// Is the current token a specified keyword?
fn is_keyword(&self, kw: &str) -> bool { fn is_keyword(&self, kw: &str) -> bool {
match self.get(self.curr.1) { let idx = self.get(self.curr.1);
Some(t) => t.text == *kw, let cached = self.cached.borrow();
match cached[idx] {
Some(ref t) => t.text == *kw,
_ => false, _ => false,
} }
} }