bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Lazily construct panic messages in char_lit().

Browse source 
This reduces the time taken to run
`rustc -Zparse-only rustc-benchmarks/issue-32278-big-array-of-strings`
from 0.18s to 0.15s on my machine, and reduces the number of
instructions (as measured by Cachegrind) from 1.34B to 1.01B.

With the change applied, the time to fully compile that benchmark is
1.96s, so this is a 1.5% improvement.
This commit is contained in:
Nicholas Nethercote 2016-09-12 14:31:51 +10:00
parent 4c274b6aea
commit 826f673664
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libsyntax/parse/mod.rs
View file

@ -302,9 +302,6 @@ pub fn char_lit(lit: &str) -> (char, isize) {
_ => panic!("lexer accepted invalid char escape `{}`", lit)
};
let msg = format!("lexer should have rejected a bad character escape {}", lit);
let msg2 = &msg[..];
fn esc(len: usize, lit: &str) -> Option<(char, isize)> {
u32::from_str_radix(&lit[2..len], 16).ok()
.and_then(char::from_u32)
@ -313,7 +310,10 @@ pub fn char_lit(lit: &str) -> (char, isize) {
let unicode_escape = || -> Option<(char, isize)> {
if lit.as_bytes()[2] == b'{' {
let idx = lit.find('}').expect(msg2);
let idx = lit.find('}').unwrap_or_else(|| {
panic!("lexer should have rejected a bad character escape {}", lit)
});
let subslice = &lit[3..idx];
u32::from_str_radix(subslice, 16).ok()
.and_then(char::from_u32)
@ -329,7 +329,9 @@ pub fn char_lit(lit: &str) -> (char, isize) {
'u' => unicode_escape(),
'U' => esc(10, lit),
_ => None,
}.expect(msg2);
}.unwrap_or_else(|| {
panic!("lexer should have rejected a bad character escape {}", lit)
})
}
/// Parse a string representing a string literal into its final form. Does