mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #58654 - estebank:underflow, r=nikomatsakis

Browse Source 
Do not underflow after resetting unmatched braces count

Fix #58638.

r? @oli-obk
This commit is contained in:
Mazdak Farrokhzad 2019-02-23 09:25:36 +01:00 committed by GitHub
commit 2db0e489bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsyntax/parse/parser.rs
View File

@ -1184,8 +1184,10 @@ impl<'a> Parser<'a> {
match ate { match ate {
Some(_) => { Some(_) => {
// See doc comment for `unmatched_angle_bracket_count`. // See doc comment for `unmatched_angle_bracket_count`.
self.unmatched_angle_bracket_count -= 1; if self.unmatched_angle_bracket_count > 0 {
debug!("expect_gt: (decrement) count={:?}", self.unmatched_angle_bracket_count); self.unmatched_angle_bracket_count -= 1;
debug!("expect_gt: (decrement) count={:?}", self.unmatched_angle_bracket_count);
}
Ok(()) Ok(())
}, },
@ -2248,8 +2250,10 @@ impl<'a> Parser<'a> {
// See doc comment for `unmatched_angle_bracket_count`. // See doc comment for `unmatched_angle_bracket_count`.
self.expect(&token::Gt)?; self.expect(&token::Gt)?;
self.unmatched_angle_bracket_count -= 1; if self.unmatched_angle_bracket_count > 0 {
debug!("parse_qpath: (decrement) count={:?}", self.unmatched_angle_bracket_count); self.unmatched_angle_bracket_count -= 1;
debug!("parse_qpath: (decrement) count={:?}", self.unmatched_angle_bracket_count);
}
self.expect(&token::ModSep)?; self.expect(&token::ModSep)?;