Fix invalid keyword order for function declarations

ken-matsui · ken-matsui · commit 6c7f4dee8f26 · 2022-05-02T18:14:43.000+09:00
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1020,7 +1020,7 @@ impl<'a> Parser<'a> {
                                 &format!("`{}` must come before `{}`", invalid_qual, current_qual),
                                 format!("{} {}", invalid_qual, current_qual),
                                 Applicability::MachineApplicable,
-                            ).note("keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`");
+                            ).note("keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`");
                     }
                 }
                 Err(err)
@@ -2086,7 +2086,7 @@ impl<'a> Parser<'a> {
                                     &format!("`{misplaced_qual}` must come before `{current_qual}`"),
                                     format!("{misplaced_qual} {current_qual}"),
                                     Applicability::MachineApplicable,
-                                ).note("keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`");
+                                ).note("keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`");
                         }
                     }
                     // Recover incorrect visibility order such as `async pub`
diff --git a/src/test/ui/async-await/no-async-const.stderr b/src/test/ui/async-await/no-async-const.stderr
@@ -7,7 +7,7 @@ LL | pub async const fn x() {}
    |     |     expected one of `extern`, `fn`, or `unsafe`
    |     help: `const` must come before `async`: `const async`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/no-unsafe-async.stderr b/src/test/ui/async-await/no-unsafe-async.stderr
@@ -12,7 +12,7 @@ LL |     unsafe async fn g() {}
 LL | }
    | - the item list ends here
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: expected one of `extern` or `fn`, found keyword `async`
   --> $DIR/no-unsafe-async.rs:11:8
@@ -23,7 +23,7 @@ LL | unsafe async fn f() {}
    | |      expected one of `extern` or `fn`
    | help: `async` must come before `unsafe`: `async unsafe`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/fn/keyword-order.rs b/src/test/ui/fn/keyword-order.rs
@@ -0,0 +1,6 @@
+// edition:2018
+
+default pub const async unsafe extern fn err() {} //~ ERROR `default` is not followed by an item
+//~^ ERROR expected item, found keyword `pub`
+
+pub default const async unsafe extern fn ok() {}
diff --git a/src/test/ui/fn/keyword-order.stderr b/src/test/ui/fn/keyword-order.stderr
@@ -0,0 +1,16 @@
+error: `default` is not followed by an item
+  --> $DIR/keyword-order.rs:3:1
+   |
+LL | default pub const async unsafe extern fn err() {}
+   | ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: expected item, found keyword `pub`
+  --> $DIR/keyword-order.rs:3:9
+   |
+LL | default pub const async unsafe extern fn err() {}
+   |         ^^^ expected item
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/issues/issue-19398.stderr b/src/test/ui/parser/issues/issue-19398.stderr
@@ -12,7 +12,7 @@ LL |
 LL | }
    | - the item list ends here
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs
@@ -11,4 +11,4 @@ async unsafe const fn test() {}
 //~| NOTE expected one of `extern` or `fn`
 //~| HELP `const` must come before `async unsafe`
 //~| SUGGESTION const async unsafe
-//~| NOTE keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+//~| NOTE keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr
@@ -7,7 +7,7 @@ LL | async unsafe const fn test() {}
    | |            expected one of `extern` or `fn`
    | help: `const` must come before `async unsafe`: `const async unsafe`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs
@@ -11,4 +11,4 @@ unsafe async fn test() {}
 //~| NOTE expected one of `extern` or `fn`
 //~| HELP `async` must come before `unsafe`
 //~| SUGGESTION async unsafe
-//~| NOTE keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+//~| NOTE keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr
@@ -7,7 +7,7 @@ LL | unsafe async fn test() {}
    | |      expected one of `extern` or `fn`
    | help: `async` must come before `unsafe`: `async unsafe`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs
@@ -11,4 +11,4 @@ unsafe const fn test() {}
 //~| NOTE expected one of `extern` or `fn`
 //~| HELP `const` must come before `unsafe`
 //~| SUGGESTION const unsafe
-//~| NOTE keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+//~| NOTE keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr
@@ -7,7 +7,7 @@ LL | unsafe const fn test() {}
    | |      expected one of `extern` or `fn`
    | help: `const` must come before `unsafe`: `const unsafe`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs
@@ -11,4 +11,4 @@ extern unsafe fn test() {}
 //~| NOTE expected `fn`
 //~| HELP `unsafe` must come before `extern`
 //~| SUGGESTION unsafe extern
-//~| NOTE keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+//~| NOTE keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr
@@ -7,7 +7,7 @@ LL | extern unsafe fn test() {}
    | |      expected `fn`
    | help: `unsafe` must come before `extern`: `unsafe extern`
    |
-   = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
+   = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ impl<'a> Parser<'a> {`
`1020`	`1020`	&format!("`{}` must come before `{}`", invalid_qual, current_qual),
`1021`	`1021`	`format!("{} {}", invalid_qual, current_qual),`
`1022`	`1022`	`Applicability::MachineApplicable,`
`1023`		- ).note("keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`");
	`1023`	+ ).note("keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`");
`1024`	`1024`	`}`
`1025`	`1025`	`}`
`1026`	`1026`	`Err(err)`
`@@ -2086,7 +2086,7 @@ impl<'a> Parser<'a> {`
`2086`	`2086`	&format!("`{misplaced_qual}` must come before `{current_qual}`"),
`2087`	`2087`	`format!("{misplaced_qual} {current_qual}"),`
`2088`	`2088`	`Applicability::MachineApplicable,`
`2089`		- ).note("keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`");
	`2089`	+ ).note("keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`");
`2090`	`2090`	`}`
`2091`	`2091`	`}`
`2092`	`2092`	// Recover incorrect visibility order such as `async pub`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| pub async const fn x() {}`
`7`	`7`	\| \| expected one of `extern`, `fn`, or `unsafe`
`8`	`8`	\| help: `const` must come before `async`: `const async`
`9`	`9`	`\|`
`10`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`10`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ LL \| unsafe async fn g() {}`
`12`	`12`	`LL \| }`
`13`	`13`	`\| - the item list ends here`
`14`	`14`	`\|`
`15`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`15`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`16`	`16`
`17`	`17`	error: expected one of `extern` or `fn`, found keyword `async`
`18`	`18`	`--> $DIR/no-unsafe-async.rs:11:8`
`@@ -23,7 +23,7 @@ LL \| unsafe async fn f() {}`
`23`	`23`	\| \| expected one of `extern` or `fn`
`24`	`24`	\| help: `async` must come before `unsafe`: `async unsafe`
`25`	`25`	`\|`
`26`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`26`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`27`	`27`
`28`	`28`	`error: aborting due to 2 previous errors`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ LL \|`
`12`	`12`	`LL \| }`
`13`	`13`	`\| - the item list ends here`
`14`	`14`	`\|`
`15`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`15`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`16`	`16`
`17`	`17`	`error: aborting due to previous error`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| async unsafe const fn test() {}`
`7`	`7`	\| \| expected one of `extern` or `fn`
`8`	`8`	\| help: `const` must come before `async unsafe`: `const async unsafe`
`9`	`9`	`\|`
`10`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`10`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| unsafe async fn test() {}`
`7`	`7`	\| \| expected one of `extern` or `fn`
`8`	`8`	\| help: `async` must come before `unsafe`: `async unsafe`
`9`	`9`	`\|`
`10`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`10`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| unsafe const fn test() {}`
`7`	`7`	\| \| expected one of `extern` or `fn`
`8`	`8`	\| help: `const` must come before `unsafe`: `const unsafe`
`9`	`9`	`\|`
`10`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`10`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \| extern unsafe fn test() {}`
`7`	`7`	\| \| expected `fn`
`8`	`8`	\| help: `unsafe` must come before `extern`: `unsafe extern`
`9`	`9`	`\|`
`10`		- = note: keyword order for functions declaration is `default`, `pub`, `const`, `async`, `unsafe`, `extern`
	`10`	+ = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern`
`11`	`11`
`12`	`12`	`error: aborting due to previous error`
`13`	`13`