From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../issue-87217-keyword-order/const-async-const.rs | 9 --------- .../issue-87217-keyword-order/const-async-const.stderr | 17 ----------------- .../issues/issue-87217-keyword-order/several-kw-jump.rs | 14 -------------- .../issue-87217-keyword-order/several-kw-jump.stderr | 13 ------------- .../issues/issue-87217-keyword-order/wrong-async.rs | 14 -------------- .../issues/issue-87217-keyword-order/wrong-async.stderr | 13 ------------- .../issues/issue-87217-keyword-order/wrong-const.rs | 14 -------------- .../issues/issue-87217-keyword-order/wrong-const.stderr | 13 ------------- .../issues/issue-87217-keyword-order/wrong-unsafe.rs | 14 -------------- .../issue-87217-keyword-order/wrong-unsafe.stderr | 13 ------------- 10 files changed, 134 deletions(-) delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs delete mode 100644 src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr (limited to 'src/test/ui/parser/issues/issue-87217-keyword-order') diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs deleted file mode 100644 index df0cd5439..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.rs +++ /dev/null @@ -1,9 +0,0 @@ -// edition:2018 - -// Test that even when `const` is already present, the proposed fix is to remove the second `const` - -const async const fn test() {} -//~^ ERROR expected one of `extern`, `fn`, or `unsafe`, found keyword `const` -//~| NOTE expected one of `extern`, `fn`, or `unsafe` -//~| HELP `const` already used earlier, remove this one -//~| NOTE `const` first seen here diff --git a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr b/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr deleted file mode 100644 index 977c6ebfe..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/const-async-const.stderr +++ /dev/null @@ -1,17 +0,0 @@ -error: expected one of `extern`, `fn`, or `unsafe`, found keyword `const` - --> $DIR/const-async-const.rs:5:13 - | -LL | const async const fn test() {} - | ^^^^^ - | | - | expected one of `extern`, `fn`, or `unsafe` - | help: `const` already used earlier, remove this one - | -note: `const` first seen here - --> $DIR/const-async-const.rs:5:1 - | -LL | const async const fn test() {} - | ^^^^^ - -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 deleted file mode 100644 index bbebc99e9..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.rs +++ /dev/null @@ -1,14 +0,0 @@ -// edition:2018 - -// There is an order to respect for keywords before a function: -// `, const, async, unsafe, extern, ""` -// -// This test ensures the compiler is helpful about them being misplaced. -// Visibilities are tested elsewhere. - -async unsafe const fn test() {} -//~^ ERROR expected one of `extern` or `fn`, found keyword `const` -//~| 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 `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 deleted file mode 100644 index f455caba1..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/several-kw-jump.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected one of `extern` or `fn`, found keyword `const` - --> $DIR/several-kw-jump.rs:9:14 - | -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 `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 deleted file mode 100644 index 4ff4cf5c8..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.rs +++ /dev/null @@ -1,14 +0,0 @@ -// edition:2018 - -// There is an order to respect for keywords before a function: -// `, const, async, unsafe, extern, ""` -// -// This test ensures the compiler is helpful about them being misplaced. -// Visibilities are tested elsewhere. - -unsafe async fn test() {} -//~^ ERROR expected one of `extern` or `fn`, found keyword `async` -//~| NOTE expected one of `extern` or `fn` -//~| HELP `async` must come before `unsafe` -//~| SUGGESTION async unsafe -//~| 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 deleted file mode 100644 index e9eb14bf0..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-async.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected one of `extern` or `fn`, found keyword `async` - --> $DIR/wrong-async.rs:9:8 - | -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 `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 deleted file mode 100644 index 2f5fbc513..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.rs +++ /dev/null @@ -1,14 +0,0 @@ -// edition:2018 - -// There is an order to respect for keywords before a function: -// `, const, async, unsafe, extern, ""` -// -// This test ensures the compiler is helpful about them being misplaced. -// Visibilities are tested elsewhere. - -unsafe const fn test() {} -//~^ ERROR expected one of `extern` or `fn`, found keyword `const` -//~| NOTE expected one of `extern` or `fn` -//~| HELP `const` must come before `unsafe` -//~| SUGGESTION const unsafe -//~| 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 deleted file mode 100644 index 0d2bc3472..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-const.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected one of `extern` or `fn`, found keyword `const` - --> $DIR/wrong-const.rs:9:8 - | -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 `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 deleted file mode 100644 index df2412e3e..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.rs +++ /dev/null @@ -1,14 +0,0 @@ -// edition:2018 - -// There is an order to respect for keywords before a function: -// `, const, async, unsafe, extern, ""` -// -// This test ensures the compiler is helpful about them being misplaced. -// Visibilities are tested elsewhere. - -extern unsafe fn test() {} -//~^ ERROR expected `fn`, found keyword `unsafe` -//~| NOTE expected `fn` -//~| HELP `unsafe` must come before `extern` -//~| SUGGESTION 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 deleted file mode 100644 index 4224713cc..000000000 --- a/src/test/ui/parser/issues/issue-87217-keyword-order/wrong-unsafe.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected `fn`, found keyword `unsafe` - --> $DIR/wrong-unsafe.rs:9:8 - | -LL | extern unsafe fn test() {} - | -------^^^^^^ - | | | - | | expected `fn` - | help: `unsafe` must come before `extern`: `unsafe extern` - | - = note: keyword order for functions declaration is `pub`, `default`, `const`, `async`, `unsafe`, `extern` - -error: aborting due to previous error - -- cgit v1.2.3