squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #65359 - Centril:sil, r=davidtwco

Browse source 
simplify integer_lit

Extracted from https://github.com/rust-lang/rust/pull/65324.

r? @davidtwco
This commit is contained in:
Mazdak Farrokhzad 2019-10-13 13:34:42 +02:00 committed by GitHub
commit af54a3e91d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libsyntax/lib.rs
View file

@ -17,6 +17,7 @@
#![feature(proc_macro_internals)]
#![feature(proc_macro_span)]
#![feature(try_trait)]
#![feature(slice_patterns)]
#![feature(unicode_internals)]
#![recursion_limit="256"]

15
src/libsyntax/parse/literal.rs
View file

@ -426,15 +426,12 @@ fn integer_lit(symbol: Symbol, suffix: Option<Symbol>) -> Result<LitKind, LitErr
let symbol = strip_underscores(symbol);
let s = symbol.as_str();
let mut base = 10;
if s.len() > 1 && s.as_bytes()[0] == b'0' {
match s.as_bytes()[1] {
b'x' => base = 16,
b'o' => base = 8,
b'b' => base = 2,
_ => {}
}
}
let base = match s.as_bytes() {
[b'0', b'x', ..] => 16,
[b'0', b'o', ..] => 8,
[b'0', b'b', ..] => 2,
_ => 10,
};
let ty = match suffix {
Some(suf) => match suf {