diff options
| author | bors <bors@rust-lang.org> | 2018-01-06 20:41:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-06 20:41:33 +0000 |
| commit | 6828cf90146c7fefc4ba4f16dffe75f763f2d910 (patch) | |
| tree | 44e745909b8c8bfc2808bacc08f5aeee4916e65e /src/libsyntax/parse | |
| parent | 72176cf96cb79a0ebf62972b76dbe68c933bef4d (diff) | |
| parent | ce701061384bae7c3b9873460c1c5df8204431fc (diff) | |
| download | rust-6828cf90146c7fefc4ba4f16dffe75f763f2d910.tar.gz rust-6828cf90146c7fefc4ba4f16dffe75f763f2d910.zip | |
Auto merge of #47235 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests - Successful merges: #46947, #47170, #47190, #47205, #47217, #47220, #47230 - Failed merges: #47233
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), |