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
This commit is contained in:
commit
e250777041
19 changed files with 291 additions and 39 deletions
|
|
@ -110,8 +110,8 @@ fn syntax() {
|
|||
let _ = #[attr] &mut 0;
|
||||
let _ = #[attr] &#[attr] 0;
|
||||
let _ = #[attr] &mut #[attr] 0;
|
||||
let _ = #[attr] break ;
|
||||
let _ = #[attr] continue ;
|
||||
let _ = #[attr] break;
|
||||
let _ = #[attr] continue;
|
||||
let _ = #[attr] return;
|
||||
let _ = #[attr] foo!();
|
||||
let _ = #[attr] foo!(#! [attr]);
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ extern crate std;
|
|||
// pretty-mode:hir
|
||||
// pp-exact:hir-pretty-loop.pp
|
||||
|
||||
pub fn foo() { loop { break ; } }
|
||||
pub fn foo() { loop { break; } }
|
||||
|
|
|
|||
|
|
@ -229,9 +229,8 @@ fn _11() {
|
|||
let _ = #[rustc_dummy] &mut 0;
|
||||
let _ = #[rustc_dummy] &#[rustc_dummy] 0;
|
||||
let _ = #[rustc_dummy] &mut #[rustc_dummy] 0;
|
||||
// FIXME: pp bug, extra space after keyword?
|
||||
while false { let _ = #[rustc_dummy] continue ; }
|
||||
while true { let _ = #[rustc_dummy] break ; }
|
||||
while false { let _ = #[rustc_dummy] continue; }
|
||||
while true { let _ = #[rustc_dummy] break; }
|
||||
|| #[rustc_dummy] return;
|
||||
let _ = #[rustc_dummy] expr_mac!();
|
||||
let _ = #[rustc_dummy] expr_mac![];
|
||||
|
|
|
|||
|
|
@ -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!(🦀);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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`.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue