nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-12 20:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #55905 - nnethercote:short_name-to-literal_name, r=Mark-Simulacrum

Browse Source 
Change `Lit::short_name` to `Lit::literal_name`.

This avoids a moderately hot allocation in `parse_lit_token`.

r? @Mark-Simulacrum
This commit is contained in:
kennytm 2018-11-13 13:03:25 +08:00
commit 64ea02a9dd
No known key found for this signature in database
GPG Key ID: FEF6C8051D0E013C
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1956,7 +1956,7 @@ impl<'a> Parser<'a> {
if suffix_illegal {
let sp = self.span;
self.expect_no_suffix(sp, &format!("{} literal", lit.short_name()), suf)
self.expect_no_suffix(sp, lit.literal_name(), suf)
}
result.unwrap()

14
src/libsyntax/parse/token.rs
View File

@ -79,14 +79,14 @@ pub enum Lit {
}
impl Lit {
crate fn short_name(&self) -> &'static str {
crate fn literal_name(&self) -> &'static str {
match *self {
Byte(_) => "byte",
Char(_) => "char",
Integer(_) => "integer",
Float(_) => "float",
Str_(_) | StrRaw(..) => "string",
ByteStr(_) | ByteStrRaw(..) => "byte string"
Byte(_) => "byte literal",
Char(_) => "char literal",
Integer(_) => "integer literal",
Float(_) => "float literal",
Str_(_) | StrRaw(..) => "string literal",
ByteStr(_) | ByteStrRaw(..) => "byte string literal"
}
}