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

Rollup merge of #62297 - matklad:peek-delimited, r=petrochenkov

Browse Source 
refactor check_for_substitution

No behavior change, just flatter and simpler code.

r? @petrochenkov
This commit is contained in:
Mazdak Farrokhzad
2019-07-04 01:38:55 +02:00
committed by GitHub
parent 44f22e694c dc088b26ce
commit c0ec567214
2 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libsyntax/parse/lexer/mod.rs
View File

@@ -83,28 +83,6 @@ impl<'a> StringReader<'a> {
Ok(ret_val)
}
/// Immutably extract string if found at current position with given delimiters
fn peek_delimited(&self, from_ch: char, to_ch: char) -> Option<String> {
let mut pos = self.pos;
let mut idx = self.src_index(pos);
let mut ch = char_at(&self.src, idx);
if ch != from_ch {
return None;
}
pos = pos + Pos::from_usize(ch.len_utf8());
let start_pos = pos;
idx = self.src_index(pos);
while idx < self.end_src_index {
ch = char_at(&self.src, idx);
if ch == to_ch {
return Some(self.src[self.src_index(start_pos)..self.src_index(pos)].to_string());
}
pos = pos + Pos::from_usize(ch.len_utf8());
idx = self.src_index(pos);
}
return None;
}
fn try_real_token(&mut self) -> Result<Token, ()> {
let mut t = self.try_next_token()?;
loop {