Skip to content

Commit

Permalink
Rollup merge of #72912 - GuillaumeGomez:add-e0755, r=estebank
Browse files Browse the repository at this point in the history
Add new E0758 error code
  • Loading branch information
Dylan-DPC authored Jun 8, 2020
2 parents 98bd22b + fbf7d27 commit 82fd390
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/librustc_error_codes/error_codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ E0751: include_str!("./error_codes/E0751.md"),
E0752: include_str!("./error_codes/E0752.md"),
E0753: include_str!("./error_codes/E0753.md"),
E0754: include_str!("./error_codes/E0754.md"),
E0758: include_str!("./error_codes/E0758.md"),
E0760: include_str!("./error_codes/E0760.md"),
;
// E0006, // merged with E0005
Expand Down
20 changes: 20 additions & 0 deletions src/librustc_error_codes/error_codes/E0758.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
A multi-line (doc-)comment is unterminated.

Erroneous code example:

```compile_fail,E0758
/* I am not terminated!
```

The same goes for doc comments:

```compile_fail,E0758
/*! I am not terminated!
```

You need to end your multi-line comment with `*/` in order to fix this error:

```
/* I am terminated! */
/*! I am also terminated! */
```
10 changes: 9 additions & 1 deletion src/librustc_parse/lexer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,15 @@ impl<'a> StringReader<'a> {
"unterminated block comment"
};
let last_bpos = self.pos;
self.fatal_span_(start, last_bpos, msg).raise();
self.sess
.span_diagnostic
.struct_span_fatal_with_code(
self.mk_sp(start, last_bpos),
msg,
error_code!(E0758),
)
.emit();
FatalError.raise();
}

if is_doc_comment {
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/unterminated-comment.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* //~ ERROR E0758
9 changes: 9 additions & 0 deletions src/test/ui/unterminated-comment.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
error[E0758]: unterminated block comment
--> $DIR/unterminated-comment.rs:1:1
|
LL | /*
| ^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0758`.
1 change: 1 addition & 0 deletions src/test/ui/unterminated-doc-comment.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*! //~ ERROR E0758
9 changes: 9 additions & 0 deletions src/test/ui/unterminated-doc-comment.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
error[E0758]: unterminated block doc-comment
--> $DIR/unterminated-doc-comment.rs:1:1
|
LL | /*!
| ^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0758`.

0 comments on commit 82fd390

Please sign in to comment.