diff options
| author | bors <bors@rust-lang.org> | 2021-12-09 04:04:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-09 04:04:01 +0000 |
| commit | e25077704164071a1ef87cdc90fe7dd1872ba3fa (patch) | |
| tree | 0c1e5f88fb29780ecfd8c8234dc6f7e7cd7e3d57 /src/test/ui/parser | |
| parent | 3c857f48ce12d1f98f3ea6d48eb9e33d8d60c985 (diff) | |
| parent | 229aa1b106634c88084887f3e4fb20abb8c92b43 (diff) | |
| download | rust-e25077704164071a1ef87cdc90fe7dd1872ba3fa.tar.gz rust-e25077704164071a1ef87cdc90fe7dd1872ba3fa.zip | |
Auto merge of #91691 - matthiaskrgr:rollup-wfommdr, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #91042 (Use Vec extend instead of repeated pushes on several places) - #91476 (Improve 'cannot contain emoji' error.) - #91568 (Pretty print break and continue without redundant space) - #91645 (Implement `core::future::join!`) - #91666 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui/parser')
| -rw-r--r-- | src/test/ui/parser/emoji-identifiers.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/parser/emoji-identifiers.stderr | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/test/ui/parser/emoji-identifiers.rs b/src/test/ui/parser/emoji-identifiers.rs index ef18939bbb8..b50c046bcb2 100644 --- a/src/test/ui/parser/emoji-identifiers.rs +++ b/src/test/ui/parser/emoji-identifiers.rs @@ -13,4 +13,7 @@ fn main() { let _ = i_like_to_๐_a_lot() โ 4; //~ ERROR cannot find function `i_like_to_๐_a_lot` in this scope //~^ ERROR identifiers cannot contain emoji //~| ERROR unknown start of token: \u{2796} + + let ๐ฆ = 1;//~ ERROR Ferris cannot be used as an identifier + dbg!(๐ฆ); } diff --git a/src/test/ui/parser/emoji-identifiers.stderr b/src/test/ui/parser/emoji-identifiers.stderr index 5f9263c4c13..7dc589e5563 100644 --- a/src/test/ui/parser/emoji-identifiers.stderr +++ b/src/test/ui/parser/emoji-identifiers.stderr @@ -18,6 +18,14 @@ LL | fn i_like_to_๐ _a_lot() -> ๐ { LL | let _ = i_like_to_๐_a_lot() โ 4; | ^^^^^^^^^^^^^^^^^^ help: a function with a similar name exists: `i_like_to_๐ _a_lot` +error: Ferris cannot be used as an identifier + --> $DIR/emoji-identifiers.rs:17:9 + | +LL | let ๐ฆ = 1; + | ^^ help: try using their name instead: `ferris` +LL | dbg!(๐ฆ); + | ^^ + error: identifiers cannot contain emoji: `ABig๐ฉ๐ฉ๐ง๐งFamily` --> $DIR/emoji-identifiers.rs:1:8 | @@ -77,7 +85,7 @@ LL | ๐::full_ofโจ() | function or associated item not found in `๐` | help: there is an associated function with a similar name: `full_of_โจ` -error: aborting due to 9 previous errors +error: aborting due to 10 previous errors Some errors have detailed explanations: E0425, E0599. For more information about an error, try `rustc --explain E0425`. |