diff options
| author | kennytm <kennytm@gmail.com> | 2018-01-07 02:36:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 02:36:02 +0800 |
| commit | b63f89783d2e91950e9fe46580f1cc6b06109739 (patch) | |
| tree | defc14049eb01446773ff4e824ea04eedcb41a71 /src/libsyntax/parse | |
| parent | d9d5c667d819ce400fc7adb09dcd6482b0aa519e (diff) | |
| parent | 210ac01792878ce0d654e852b0c794c782c04e01 (diff) | |
| download | rust-b63f89783d2e91950e9fe46580f1cc6b06109739.tar.gz rust-b63f89783d2e91950e9fe46580f1cc6b06109739.zip | |
Rollup merge of #47170 - eddyb:us-vs-usize, r=nikomatsakis
rustc: use {U,I}size instead of {U,I}s shorthands.
`Us`/`Is` come from a time when `us` and `is` were the literal suffixes that are now `usize` / `isize`.
r? @nikomatsakis
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index a38ceba2f45..a9b1e4aaa60 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -603,13 +603,13 @@ pub fn integer_lit(s: &str, suffix: Option<Symbol>, diag: Option<(Span, &Handler err!(diag, |span, diag| diag.span_bug(span, "found empty literal suffix in Some")); } ty = match &*suf.as_str() { - "isize" => ast::LitIntType::Signed(ast::IntTy::Is), + "isize" => ast::LitIntType::Signed(ast::IntTy::Isize), "i8" => ast::LitIntType::Signed(ast::IntTy::I8), "i16" => ast::LitIntType::Signed(ast::IntTy::I16), "i32" => ast::LitIntType::Signed(ast::IntTy::I32), "i64" => ast::LitIntType::Signed(ast::IntTy::I64), "i128" => ast::LitIntType::Signed(ast::IntTy::I128), - "usize" => ast::LitIntType::Unsigned(ast::UintTy::Us), + "usize" => ast::LitIntType::Unsigned(ast::UintTy::Usize), "u8" => ast::LitIntType::Unsigned(ast::UintTy::U8), "u16" => ast::LitIntType::Unsigned(ast::UintTy::U16), "u32" => ast::LitIntType::Unsigned(ast::UintTy::U32), |
