forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#68084 - estebank:ice-68000, r=varkor
Do not ICE on unicode next point Use `shrink_to_hi` instead of `next_point` and fix `next_point`. Fix rust-lang#68000, fix rust-lang#68091, fix rust-lang#68092.
- Loading branch information
Showing
16 changed files
with
83 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
pub struct Foo { | ||
pub bar: Vec<i32>ö | ||
//~^ ERROR expected `,`, or `}`, found `ö` | ||
} //~ ERROR expected `:`, found `}` | ||
|
||
fn main() {} |
17 changes: 17 additions & 0 deletions
17
src/test/ui/issues/issue-68000-unicode-ident-after-missing-comma.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
error: expected `,`, or `}`, found `ö` | ||
--> $DIR/issue-68000-unicode-ident-after-missing-comma.rs:2:22 | ||
| | ||
LL | pub bar: Vec<i32>ö | ||
| ^ help: try adding a comma: `,` | ||
|
||
error: expected `:`, found `}` | ||
--> $DIR/issue-68000-unicode-ident-after-missing-comma.rs:4:1 | ||
| | ||
LL | pub bar: Vec<i32>ö | ||
| - expected `:` | ||
LL | | ||
LL | } | ||
| ^ unexpected token | ||
|
||
error: aborting due to 2 previous errors | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
macro_rules! x { | ||
($($c:tt)*) => { | ||
$($c)ö* {} //~ ERROR missing condition for `if` expression | ||
}; //~| ERROR mismatched types | ||
} | ||
|
||
fn main() { | ||
x!(if); | ||
} |
18 changes: 18 additions & 0 deletions
18
src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
error: missing condition for `if` expression | ||
--> $DIR/issue-68091-unicode-ident-after-if.rs:3:14 | ||
| | ||
LL | $($c)ö* {} | ||
| ^ expected if condition here | ||
|
||
error[E0308]: mismatched types | ||
--> $DIR/issue-68091-unicode-ident-after-if.rs:3:17 | ||
| | ||
LL | $($c)ö* {} | ||
| ^^ expected `bool`, found `()` | ||
... | ||
LL | x!(if); | ||
| ------- in this macro invocation | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0308`. |
9 changes: 9 additions & 0 deletions
9
src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
macro_rules! x { | ||
($($c:tt)*) => { | ||
$($c)ö* //~ ERROR macro expansion ends with an incomplete expression: expected expression | ||
}; | ||
} | ||
|
||
fn main() { | ||
x!(!); | ||
} |
8 changes: 8 additions & 0 deletions
8
src/test/ui/issues/issue-68092-unicode-ident-after-incomplete-expr.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
error: macro expansion ends with an incomplete expression: expected expression | ||
--> $DIR/issue-68092-unicode-ident-after-incomplete-expr.rs:3:14 | ||
| | ||
LL | $($c)ö* | ||
| ^ expected expression | ||
|
||
error: aborting due to previous error | ||
|