From 694f76d56117bf178fb21d4a99f6b773b4ece119 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sat, 18 May 2019 22:44:09 +0300 Subject: [PATCH] syntax: More consistent wording for some literal parsing errors --- src/libsyntax/parse/literal.rs | 4 ++-- src/test/ui/old-suffixes-are-really-forbidden.stderr | 4 ++-- src/test/ui/parser/bad-lit-suffixes.rs | 4 ++-- src/test/ui/parser/bad-lit-suffixes.stderr | 4 ++-- src/test/ui/parser/int-literal-too-large-span.rs | 2 +- src/test/ui/parser/int-literal-too-large-span.stderr | 2 +- src/test/ui/parser/issue-5544-a.rs | 2 +- src/test/ui/parser/issue-5544-a.stderr | 2 +- src/test/ui/parser/issue-5544-b.rs | 2 +- src/test/ui/parser/issue-5544-b.stderr | 2 +- src/test/ui/parser/lex-bad-numeric-literals.rs | 4 ++-- src/test/ui/parser/lex-bad-numeric-literals.stderr | 4 ++-- src/test/ui/parser/no-binary-float-literal.rs | 2 +- src/test/ui/parser/no-binary-float-literal.stderr | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/libsyntax/parse/literal.rs b/src/libsyntax/parse/literal.rs index 343aa6bc653..b4a2c6a7a85 100644 --- a/src/libsyntax/parse/literal.rs +++ b/src/libsyntax/parse/literal.rs @@ -42,7 +42,7 @@ impl LitError { .help("valid widths are 8, 16, 32, 64 and 128") .emit(); } else { - let msg = format!("invalid suffix `{}` for numeric literal", suf); + let msg = format!("invalid suffix `{}` for integer literal", suf); diag.struct_span_err(span, &msg) .span_label(span, format!("invalid suffix `{}`", suf)) .help("the suffix must be one of the integral types (`u32`, `isize`, etc)") @@ -71,7 +71,7 @@ impl LitError { .emit(); } LitError::IntTooLarge => { - diag.struct_span_err(span, "int literal is too large") + diag.struct_span_err(span, "integer literal is too large") .emit(); } } diff --git a/src/test/ui/old-suffixes-are-really-forbidden.stderr b/src/test/ui/old-suffixes-are-really-forbidden.stderr index 9d1e8d071f0..ccfe60e964b 100644 --- a/src/test/ui/old-suffixes-are-really-forbidden.stderr +++ b/src/test/ui/old-suffixes-are-really-forbidden.stderr @@ -1,4 +1,4 @@ -error: invalid suffix `is` for numeric literal +error: invalid suffix `is` for integer literal --> $DIR/old-suffixes-are-really-forbidden.rs:2:13 | LL | let a = 1_is; @@ -6,7 +6,7 @@ LL | let a = 1_is; | = help: the suffix must be one of the integral types (`u32`, `isize`, etc) -error: invalid suffix `us` for numeric literal +error: invalid suffix `us` for integer literal --> $DIR/old-suffixes-are-really-forbidden.rs:3:13 | LL | let b = 2_us; diff --git a/src/test/ui/parser/bad-lit-suffixes.rs b/src/test/ui/parser/bad-lit-suffixes.rs index 75bed308858..151c6e1527f 100644 --- a/src/test/ui/parser/bad-lit-suffixes.rs +++ b/src/test/ui/parser/bad-lit-suffixes.rs @@ -22,8 +22,8 @@ fn main() { 1234f1024; //~ ERROR invalid width `1024` for float literal 1234.5f1024; //~ ERROR invalid width `1024` for float literal - 1234suffix; //~ ERROR invalid suffix `suffix` for numeric literal - 0b101suffix; //~ ERROR invalid suffix `suffix` for numeric literal + 1234suffix; //~ ERROR invalid suffix `suffix` for integer literal + 0b101suffix; //~ ERROR invalid suffix `suffix` for integer literal 1.0suffix; //~ ERROR invalid suffix `suffix` for float literal 1.0e10suffix; //~ ERROR invalid suffix `suffix` for float literal } diff --git a/src/test/ui/parser/bad-lit-suffixes.stderr b/src/test/ui/parser/bad-lit-suffixes.stderr index de194f4820d..e53b1498332 100644 --- a/src/test/ui/parser/bad-lit-suffixes.stderr +++ b/src/test/ui/parser/bad-lit-suffixes.stderr @@ -78,7 +78,7 @@ LL | 1234.5f1024; | = help: valid widths are 32 and 64 -error: invalid suffix `suffix` for numeric literal +error: invalid suffix `suffix` for integer literal --> $DIR/bad-lit-suffixes.rs:25:5 | LL | 1234suffix; @@ -86,7 +86,7 @@ LL | 1234suffix; | = help: the suffix must be one of the integral types (`u32`, `isize`, etc) -error: invalid suffix `suffix` for numeric literal +error: invalid suffix `suffix` for integer literal --> $DIR/bad-lit-suffixes.rs:26:5 | LL | 0b101suffix; diff --git a/src/test/ui/parser/int-literal-too-large-span.rs b/src/test/ui/parser/int-literal-too-large-span.rs index 206242c3c7f..666ca935059 100644 --- a/src/test/ui/parser/int-literal-too-large-span.rs +++ b/src/test/ui/parser/int-literal-too-large-span.rs @@ -2,6 +2,6 @@ fn main() { 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 - //~^ ERROR int literal is too large + //~^ ERROR integer literal is too large ; // the span shouldn't point to this. } diff --git a/src/test/ui/parser/int-literal-too-large-span.stderr b/src/test/ui/parser/int-literal-too-large-span.stderr index d7774c333c2..7cae85fc9fe 100644 --- a/src/test/ui/parser/int-literal-too-large-span.stderr +++ b/src/test/ui/parser/int-literal-too-large-span.stderr @@ -1,4 +1,4 @@ -error: int literal is too large +error: integer literal is too large --> $DIR/int-literal-too-large-span.rs:4:5 | LL | 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 diff --git a/src/test/ui/parser/issue-5544-a.rs b/src/test/ui/parser/issue-5544-a.rs index 303b902c499..3c239c73b9d 100644 --- a/src/test/ui/parser/issue-5544-a.rs +++ b/src/test/ui/parser/issue-5544-a.rs @@ -1,4 +1,4 @@ fn main() { let __isize = 340282366920938463463374607431768211456; // 2^128 - //~^ ERROR int literal is too large + //~^ ERROR integer literal is too large } diff --git a/src/test/ui/parser/issue-5544-a.stderr b/src/test/ui/parser/issue-5544-a.stderr index bc48853b380..de579c3c134 100644 --- a/src/test/ui/parser/issue-5544-a.stderr +++ b/src/test/ui/parser/issue-5544-a.stderr @@ -1,4 +1,4 @@ -error: int literal is too large +error: integer literal is too large --> $DIR/issue-5544-a.rs:2:19 | LL | let __isize = 340282366920938463463374607431768211456; // 2^128 diff --git a/src/test/ui/parser/issue-5544-b.rs b/src/test/ui/parser/issue-5544-b.rs index fa40f15dedb..93f2ff27136 100644 --- a/src/test/ui/parser/issue-5544-b.rs +++ b/src/test/ui/parser/issue-5544-b.rs @@ -1,4 +1,4 @@ fn main() { let __isize = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff_ff; - //~^ ERROR int literal is too large + //~^ ERROR integer literal is too large } diff --git a/src/test/ui/parser/issue-5544-b.stderr b/src/test/ui/parser/issue-5544-b.stderr index 3f15c0c0d75..7df212dedfe 100644 --- a/src/test/ui/parser/issue-5544-b.stderr +++ b/src/test/ui/parser/issue-5544-b.stderr @@ -1,4 +1,4 @@ -error: int literal is too large +error: integer literal is too large --> $DIR/issue-5544-b.rs:2:19 | LL | let __isize = 0xffff_ffff_ffff_ffff_ffff_ffff_ffff_ffff_ff; diff --git a/src/test/ui/parser/lex-bad-numeric-literals.rs b/src/test/ui/parser/lex-bad-numeric-literals.rs index 9496ad305fc..440150da170 100644 --- a/src/test/ui/parser/lex-bad-numeric-literals.rs +++ b/src/test/ui/parser/lex-bad-numeric-literals.rs @@ -13,8 +13,8 @@ fn main() { 0o; //~ ERROR: no valid digits 1e+; //~ ERROR: expected at least one digit in exponent 0x539.0; //~ ERROR: hexadecimal float literal is not supported - 9900000000000000000000000000999999999999999999999999999999; //~ ERROR: int literal is too large - 9900000000000000000000000000999999999999999999999999999999; //~ ERROR: int literal is too large + 9900000000000000000000000000999999999999999999999999999999; //~ ERROR: integer literal is too large + 9900000000000000000000000000999999999999999999999999999999; //~ ERROR: integer literal is too large 0x; //~ ERROR: no valid digits 0xu32; //~ ERROR: no valid digits 0ou32; //~ ERROR: no valid digits diff --git a/src/test/ui/parser/lex-bad-numeric-literals.stderr b/src/test/ui/parser/lex-bad-numeric-literals.stderr index 466d7af1bda..2058ea63ce4 100644 --- a/src/test/ui/parser/lex-bad-numeric-literals.stderr +++ b/src/test/ui/parser/lex-bad-numeric-literals.stderr @@ -112,13 +112,13 @@ error: octal float literal is not supported LL | 0o2f32; | ^^^^^^ not supported -error: int literal is too large +error: integer literal is too large --> $DIR/lex-bad-numeric-literals.rs:16:5 | LL | 9900000000000000000000000000999999999999999999999999999999; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: int literal is too large +error: integer literal is too large --> $DIR/lex-bad-numeric-literals.rs:17:5 | LL | 9900000000000000000000000000999999999999999999999999999999; diff --git a/src/test/ui/parser/no-binary-float-literal.rs b/src/test/ui/parser/no-binary-float-literal.rs index a42d2cbc442..052cb4934f5 100644 --- a/src/test/ui/parser/no-binary-float-literal.rs +++ b/src/test/ui/parser/no-binary-float-literal.rs @@ -4,5 +4,5 @@ fn main() { 0b101.010; //~^ ERROR binary float literal is not supported 0b101p4f64; - //~^ ERROR invalid suffix `p4f64` for numeric literal + //~^ ERROR invalid suffix `p4f64` for integer literal } diff --git a/src/test/ui/parser/no-binary-float-literal.stderr b/src/test/ui/parser/no-binary-float-literal.stderr index 21f415bcfb0..65b129b5827 100644 --- a/src/test/ui/parser/no-binary-float-literal.stderr +++ b/src/test/ui/parser/no-binary-float-literal.stderr @@ -10,7 +10,7 @@ error: binary float literal is not supported LL | 0b101010f64; | ^^^^^^^^^^^ not supported -error: invalid suffix `p4f64` for numeric literal +error: invalid suffix `p4f64` for integer literal --> $DIR/no-binary-float-literal.rs:6:5 | LL | 0b101p4f64; -- GitLab