Skip to content

Commit d8610b3

Browse files
committed
Continue evaluating after parsing incorrect binary literal
1 parent fc4b541 commit d8610b3

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

src/libsyntax/parse/lexer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ impl<'a> StringReader<'a> {
299299

300300
/// Report a lexical error with a given span.
301301
fn err_span(&self, sp: Span, m: &str) {
302-
self.sess.span_diagnostic.span_err(sp, m)
302+
self.sess.span_diagnostic.struct_span_err(sp, m).emit();
303303
}
304304

305305

src/test/ui/parser/issue-1802-1.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// error-pattern:no valid digits found for number
1+
fn log(a: i32, b: i32) {}
2+
23
fn main() {
4+
let error = 42;
35
log(error, 0b);
6+
//~^ ERROR no valid digits found for number
47
}

src/test/ui/parser/issue-1802-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: no valid digits found for number
2-
--> $DIR/issue-1802-1.rs:3:16
2+
--> $DIR/issue-1802-1.rs:5:16
33
|
44
LL | log(error, 0b);
55
| ^^

src/test/ui/parser/issue-1802-2.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// error-pattern:no valid digits found for number
1+
fn log(a: i32, b: i32) {}
2+
23
fn main() {
4+
let error = 42;
35
log(error, 0b_usize);
6+
//~^ ERROR no valid digits found for number
47
}
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
error: no valid digits found for number
2-
--> $DIR/issue-1802-2.rs:3:16
2+
--> $DIR/issue-1802-2.rs:5:16
33
|
44
LL | log(error, 0b_usize);
55
| ^^^
66

7-
error: aborting due to previous error
7+
error[E0308]: mismatched types
8+
--> $DIR/issue-1802-2.rs:5:16
9+
|
10+
LL | log(error, 0b_usize);
11+
| ^^^^^^^^ expected i32, found usize
12+
13+
error: aborting due to 2 previous errors
814

15+
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)