From bd1feb8cef898945e1486bbaef1043668a5a5e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Mon, 6 Nov 2023 23:43:26 +0000
Subject: [PATCH] Fix test and move to more appropriate directory

---
 tests/ui/parser/issues/issue-104088.stderr    | 35 -----------
 .../binding-name-starting-with-number.rs}     |  6 +-
 .../binding-name-starting-with-number.stderr  | 59 +++++++++++++++++++
 3 files changed, 63 insertions(+), 37 deletions(-)
 delete mode 100644 tests/ui/parser/issues/issue-104088.stderr
 rename tests/ui/parser/{issues/issue-104088.rs => recover/binding-name-starting-with-number.rs} (93%)
 create mode 100644 tests/ui/parser/recover/binding-name-starting-with-number.stderr

diff --git a/tests/ui/parser/issues/issue-104088.stderr b/tests/ui/parser/issues/issue-104088.stderr
deleted file mode 100644
index ff24b0057f6..00000000000
--- a/tests/ui/parser/issues/issue-104088.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error: expected identifier, found `1234test`
-  --> $DIR/issue-104088.rs:1:4
-   |
-LL | fn 1234test() {
-   |    ^^^^^^^^ expected identifier
-   |
-help: identifiers cannot start with a number
-  --> $DIR/issue-104088.rs:1:4
-   |
-LL | fn 1234test() {
-   |    ^^^^
-
-error: expected identifier, found `23name`
-  --> $DIR/issue-104088.rs:9:9
-   |
-LL |     let 23name = 123;
-   |         ^^^^^^ expected identifier
-   |
-help: identifiers cannot start with a number
-  --> $DIR/issue-104088.rs:9:9
-   |
-LL |     let 23name = 123;
-   |         ^^
-
-error[E0308]: mismatched types
-  --> $DIR/issue-104088.rs:5:12
-   |
-LL |     if let 2e1 = 123 {
-   |            ^^^   --- this expression has type `{integer}`
-   |            |
-   |            expected integer, found floating-point number
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/parser/issues/issue-104088.rs b/tests/ui/parser/recover/binding-name-starting-with-number.rs
similarity index 93%
rename from tests/ui/parser/issues/issue-104088.rs
rename to tests/ui/parser/recover/binding-name-starting-with-number.rs
index 3dc636b6a33..6b279c5539e 100644
--- a/tests/ui/parser/issues/issue-104088.rs
+++ b/tests/ui/parser/recover/binding-name-starting-with-number.rs
@@ -8,10 +8,12 @@ fn 1234test() {
 
     let 23name = 123;
     //~^ ERROR expected identifier, found `23name`
-
+}
+fn foo() {
     let 2x: i32 = 123;
     //~^ ERROR expected identifier, found `2x`
-
+}
+fn bar() {
     let 1x = 123;
     //~^ ERROR expected identifier, found `1x`
 }
diff --git a/tests/ui/parser/recover/binding-name-starting-with-number.stderr b/tests/ui/parser/recover/binding-name-starting-with-number.stderr
new file mode 100644
index 00000000000..de59a7de043
--- /dev/null
+++ b/tests/ui/parser/recover/binding-name-starting-with-number.stderr
@@ -0,0 +1,59 @@
+error: expected identifier, found `1234test`
+  --> $DIR/binding-name-starting-with-number.rs:1:4
+   |
+LL | fn 1234test() {
+   |    ^^^^^^^^ expected identifier
+   |
+help: identifiers cannot start with a number
+  --> $DIR/binding-name-starting-with-number.rs:1:4
+   |
+LL | fn 1234test() {
+   |    ^^^^
+
+error: expected identifier, found `23name`
+  --> $DIR/binding-name-starting-with-number.rs:9:9
+   |
+LL |     let 23name = 123;
+   |         ^^^^^^ expected identifier
+   |
+help: identifiers cannot start with a number
+  --> $DIR/binding-name-starting-with-number.rs:9:9
+   |
+LL |     let 23name = 123;
+   |         ^^
+
+error: expected identifier, found `2x`
+  --> $DIR/binding-name-starting-with-number.rs:13:9
+   |
+LL |     let 2x: i32 = 123;
+   |         ^^ expected identifier
+   |
+help: identifiers cannot start with a number
+  --> $DIR/binding-name-starting-with-number.rs:13:9
+   |
+LL |     let 2x: i32 = 123;
+   |         ^
+
+error: expected identifier, found `1x`
+  --> $DIR/binding-name-starting-with-number.rs:17:9
+   |
+LL |     let 1x = 123;
+   |         ^^ expected identifier
+   |
+help: identifiers cannot start with a number
+  --> $DIR/binding-name-starting-with-number.rs:17:9
+   |
+LL |     let 1x = 123;
+   |         ^
+
+error[E0308]: mismatched types
+  --> $DIR/binding-name-starting-with-number.rs:5:12
+   |
+LL |     if let 2e1 = 123 {
+   |            ^^^   --- this expression has type `{integer}`
+   |            |
+   |            expected integer, found floating-point number
+
+error: aborting due to 5 previous errors
+
+For more information about this error, try `rustc --explain E0308`.