Skip to content

Commit 218982b

Browse files
varkorvarkor
committed
Place types inside backticks
1 parent c5fdff2 commit 218982b

17 files changed

+95
-97
lines changed

‎src/librustc_lint/types.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
106106
cx.span_lint(
107107
OVERFLOWING_LITERALS,
108108
e.span,
109-
&format!("literal out of range for {:?}", t),
109+
&format!("literal out of range for `{:?}`", t),
110110
);
111111
return;
112112
}
@@ -136,11 +136,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
136136
let mut err = cx.struct_span_lint(
137137
OVERFLOWING_LITERALS,
138138
parent_expr.span,
139-
"only u8 can be cast into char",
139+
"only `u8` can be cast into `char`",
140140
);
141141
err.span_suggestion(
142142
parent_expr.span,
143-
&"use a char literal instead",
143+
&"use a `char` literal instead",
144144
format!("'\\u{{{:X}}}'", lit_val),
145145
Applicability::MachineApplicable,
146146
);
@@ -165,7 +165,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
165165
parent_expr.span,
166166
&format!(
167167
"range endpoint is out of range \
168-
for {:?}",
168+
for `{:?}`",
169169
t,
170170
),
171171
);
@@ -206,7 +206,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
206206
cx.span_lint(
207207
OVERFLOWING_LITERALS,
208208
e.span,
209-
&format!("literal out of range for {:?}", t),
209+
&format!("literal out of range for `{:?}`", t),
210210
);
211211
}
212212
}
@@ -224,7 +224,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
224224
if is_infinite == Ok(true) {
225225
cx.span_lint(OVERFLOWING_LITERALS,
226226
e.span,
227-
&format!("literal out of range for {:?}", t));
227+
&format!("literal out of range for `{:?}`", t));
228228
}
229229
}
230230
_ => (),

‎src/test/ui/cast_char.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
fn main() {
44
const XYZ: char = 0x1F888 as char;
5-
//~^ ERROR only u8 can be cast into char
5+
//~^ ERROR only `u8` can be cast into `char`
66
const XY: char = 129160 as char;
7-
//~^ ERROR only u8 can be cast into char
7+
//~^ ERROR only `u8` can be cast into `char`
88
const ZYX: char = '\u{01F888}';
99
println!("{}", XYZ);
1010
}

‎src/test/ui/cast_char.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
error: only u8 can be cast into char
1+
error: only `u8` can be cast into `char`
22
--> $DIR/cast_char.rs:4:23
33
|
44
LL | const XYZ: char = 0x1F888 as char;
5-
| ^^^^^^^^^^^^^^^ help: use a char literal instead: `'\u{1F888}'`
5+
| ^^^^^^^^^^^^^^^ help: use a `char` literal instead: `'\u{1F888}'`
66
|
77
note: lint level defined here
88
--> $DIR/cast_char.rs:1:9
99
|
1010
LL | #![deny(overflowing_literals)]
1111
| ^^^^^^^^^^^^^^^^^^^^
1212

13-
error: only u8 can be cast into char
13+
error: only `u8` can be cast into `char`
1414
--> $DIR/cast_char.rs:6:22
1515
|
1616
LL | const XY: char = 129160 as char;
17-
| ^^^^^^^^^^^^^^ help: use a char literal instead: `'\u{1F888}'`
17+
| ^^^^^^^^^^^^^^ help: use a `char` literal instead: `'\u{1F888}'`
1818

1919
error: aborting due to 2 previous errors
2020

‎src/test/ui/enum/enum-discrim-too-small2.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
enum Ei8 {
66
Ai8 = 23,
77
Bi8 = -23,
8-
Ci8 = 223, //~ ERROR literal out of range for i8
8+
Ci8 = 223, //~ ERROR literal out of range for `i8`
99
}
1010

1111
#[repr(i16)]
1212
enum Ei16 {
1313
Ai16 = 23,
1414
Bi16 = -22333,
15-
Ci16 = 55555, //~ ERROR literal out of range for i16
15+
Ci16 = 55555, //~ ERROR literal out of range for `i16`
1616
}
1717

1818
#[repr(i32)]
1919
enum Ei32 {
2020
Ai32 = 23,
2121
Bi32 = -2_000_000_000,
22-
Ci32 = 3_000_000_000, //~ ERROR literal out of range for i32
22+
Ci32 = 3_000_000_000, //~ ERROR literal out of range for `i32`
2323
}
2424

2525
#[repr(i64)]
2626
enum Ei64 {
2727
Ai64 = 23,
2828
Bi64 = -9223372036854775808,
29-
Ci64 = 9223372036854775809, //~ ERROR literal out of range for i64
29+
Ci64 = 9223372036854775809, //~ ERROR literal out of range for `i64`
3030
}
3131

3232
// u64 currently allows negative numbers, and i64 allows numbers greater than `1<<63`. This is a

‎src/test/ui/enum/enum-discrim-too-small2.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: literal out of range for i8
1+
error: literal out of range for `i8`
22
--> $DIR/enum-discrim-too-small2.rs:8:11
33
|
44
LL | Ci8 = 223,
@@ -10,19 +10,19 @@ note: lint level defined here
1010
LL | #![deny(overflowing_literals)]
1111
| ^^^^^^^^^^^^^^^^^^^^
1212

13-
error: literal out of range for i16
13+
error: literal out of range for `i16`
1414
--> $DIR/enum-discrim-too-small2.rs:15:12
1515
|
1616
LL | Ci16 = 55555,
1717
| ^^^^^
1818

19-
error: literal out of range for i32
19+
error: literal out of range for `i32`
2020
--> $DIR/enum-discrim-too-small2.rs:22:12
2121
|
2222
LL | Ci32 = 3_000_000_000,
2323
| ^^^^^^^^^^^^^
2424

25-
error: literal out of range for i64
25+
error: literal out of range for `i64`
2626
--> $DIR/enum-discrim-too-small2.rs:29:12
2727
|
2828
LL | Ci64 = 9223372036854775809,

‎src/test/ui/lint/deny-overflowing-literals.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fn main() {
22
let x: u8 = 256;
3-
//~^ error: literal out of range for u8
3+
//~^ error: literal out of range for `u8`
44
}

‎src/test/ui/lint/deny-overflowing-literals.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: literal out of range for u8
1+
error: literal out of range for `u8`
22
--> $DIR/deny-overflowing-literals.rs:2:17
33
|
44
LL | let x: u8 = 256;

‎src/test/ui/lint/lint-range-endpoint-overflow.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#![deny(overflowing_literals)]
22

33
fn main() {
4-
let range_a = 0..256; //~ ERROR range endpoint is out of range for u8
4+
let range_a = 0..256; //~ ERROR range endpoint is out of range for `u8`
55
let range_b = 0..=255; // ok
6-
let range_c = 0..=256; //~ ERROR literal out of range for u8
7-
let range_d = 256..5; //~ ERROR literal out of range for u8
8-
let range_e = 0..257; //~ ERROR literal out of range for u8
6+
let range_c = 0..=256; //~ ERROR literal out of range for `u8`
7+
let range_d = 256..5; //~ ERROR literal out of range for `u8`
8+
let range_e = 0..257; //~ ERROR literal out of range for `u8`
99

1010
range_a.collect::<Vec<u8>>();
1111
range_b.collect::<Vec<u8>>();

‎src/test/ui/lint/lint-range-endpoint-overflow.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: range endpoint is out of range for u8
1+
error: range endpoint is out of range for `u8`
22
--> $DIR/lint-range-endpoint-overflow.rs:4:19
33
|
44
LL | let range_a = 0..256;
@@ -10,19 +10,19 @@ note: lint level defined here
1010
LL | #![deny(overflowing_literals)]
1111
| ^^^^^^^^^^^^^^^^^^^^
1212

13-
error: literal out of range for u8
13+
error: literal out of range for `u8`
1414
--> $DIR/lint-range-endpoint-overflow.rs:6:23
1515
|
1616
LL | let range_c = 0..=256;
1717
| ^^^
1818

19-
error: literal out of range for u8
19+
error: literal out of range for `u8`
2020
--> $DIR/lint-range-endpoint-overflow.rs:7:19
2121
|
2222
LL | let range_d = 256..5;
2323
| ^^^
2424

25-
error: literal out of range for u8
25+
error: literal out of range for `u8`
2626
--> $DIR/lint-range-endpoint-overflow.rs:8:22
2727
|
2828
LL | let range_e = 0..257;

‎src/test/ui/lint/lint-type-limits2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ fn bar() -> i8 {
1111

1212
fn baz() -> bool {
1313
128 > bar() //~ ERROR comparison is useless due to type limits
14-
//~| WARN literal out of range for i8
14+
//~| WARN literal out of range for `i8`
1515
}

0 commit comments

Comments
 (0)