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 --- .../mod_file_nonascii_with_path_allowed-aux.rs | 1 - .../ui/rfc-2457/crate_name_nonascii_forbidden-1.rs | 3 -- .../crate_name_nonascii_forbidden-1.stderr | 8 ----- .../ui/rfc-2457/crate_name_nonascii_forbidden-2.rs | 6 ---- .../crate_name_nonascii_forbidden-2.stderr | 8 ----- .../ui/rfc-2457/extern_block_nonascii_forbidden.rs | 9 ------ .../extern_block_nonascii_forbidden.stderr | 34 ---------------------- src/test/ui/rfc-2457/idents-normalized.rs | 7 ----- .../ui/rfc-2457/mod_file_nonascii_forbidden.rs | 4 --- .../ui/rfc-2457/mod_file_nonascii_forbidden.stderr | 20 ------------- .../mod_file_nonascii_with_path_allowed.rs | 6 ---- .../ui/rfc-2457/mod_inline_nonascii_allowed.rs | 7 ----- .../ui/rfc-2457/no_mangle_nonascii_forbidden.rs | 20 ------------- .../rfc-2457/no_mangle_nonascii_forbidden.stderr | 21 ------------- 14 files changed, 154 deletions(-) delete mode 100644 src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs delete mode 100644 src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs delete mode 100644 src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr delete mode 100644 src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs delete mode 100644 src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr delete mode 100644 src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs delete mode 100644 src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr delete mode 100644 src/test/ui/rfc-2457/idents-normalized.rs delete mode 100644 src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs delete mode 100644 src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr delete mode 100644 src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs delete mode 100644 src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs delete mode 100644 src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs delete mode 100644 src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr (limited to 'src/test/ui/rfc-2457') diff --git a/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs b/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs deleted file mode 100644 index e373b6438..000000000 --- a/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs +++ /dev/null @@ -1 +0,0 @@ -pub trait Foo {} diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs b/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs deleted file mode 100644 index c07ba54af..000000000 --- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.rs +++ /dev/null @@ -1,3 +0,0 @@ -extern crate ьаг; //~ ERROR cannot load a crate with a non-ascii name `ьаг` - -fn main() {} diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr b/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr deleted file mode 100644 index a8f3abe59..000000000 --- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-1.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: cannot load a crate with a non-ascii name `ьаг` - --> $DIR/crate_name_nonascii_forbidden-1.rs:1:1 - | -LL | extern crate ьаг; - | ^^^^^^^^^^^^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs b/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs deleted file mode 100644 index f8e033937..000000000 --- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.rs +++ /dev/null @@ -1,6 +0,0 @@ -// compile-flags:--extern му_сгате -// edition:2018 - -use му_сгате::baz; //~ ERROR cannot load a crate with a non-ascii name `му_сгате` - -fn main() {} diff --git a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr b/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr deleted file mode 100644 index 05fc4fb22..000000000 --- a/src/test/ui/rfc-2457/crate_name_nonascii_forbidden-2.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: cannot load a crate with a non-ascii name `му_сгате` - --> $DIR/crate_name_nonascii_forbidden-2.rs:4:5 - | -LL | use му_сгате::baz; - | ^^^^^^^^ - -error: aborting due to previous error - diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs b/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs deleted file mode 100644 index ad6825404..000000000 --- a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.rs +++ /dev/null @@ -1,9 +0,0 @@ -#![feature(extern_types)] - -extern "C" { - type 一; //~ items in `extern` blocks cannot use non-ascii identifiers - fn 二(); //~ items in `extern` blocks cannot use non-ascii identifiers - static 三: usize; //~ items in `extern` blocks cannot use non-ascii identifiers -} - -fn main() {} diff --git a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr b/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr deleted file mode 100644 index ca1b8a6e7..000000000 --- a/src/test/ui/rfc-2457/extern_block_nonascii_forbidden.stderr +++ /dev/null @@ -1,34 +0,0 @@ -error: items in `extern` blocks cannot use non-ascii identifiers - --> $DIR/extern_block_nonascii_forbidden.rs:4:10 - | -LL | extern "C" { - | ---------- in this `extern` block -LL | type 一; - | ^^ - | - = note: this limitation may be lifted in the future; see issue #83942 for more information - -error: items in `extern` blocks cannot use non-ascii identifiers - --> $DIR/extern_block_nonascii_forbidden.rs:5:8 - | -LL | extern "C" { - | ---------- in this `extern` block -LL | type 一; -LL | fn 二(); - | ^^ - | - = note: this limitation may be lifted in the future; see issue #83942 for more information - -error: items in `extern` blocks cannot use non-ascii identifiers - --> $DIR/extern_block_nonascii_forbidden.rs:6:12 - | -LL | extern "C" { - | ---------- in this `extern` block -... -LL | static 三: usize; - | ^^ - | - = note: this limitation may be lifted in the future; see issue #83942 for more information - -error: aborting due to 3 previous errors - diff --git a/src/test/ui/rfc-2457/idents-normalized.rs b/src/test/ui/rfc-2457/idents-normalized.rs deleted file mode 100644 index 1023fee37..000000000 --- a/src/test/ui/rfc-2457/idents-normalized.rs +++ /dev/null @@ -1,7 +0,0 @@ -// check-pass - -struct Résumé; // ['LATIN SMALL LETTER E WITH ACUTE'] - -fn main() { - let _ = Résumé; // ['LATIN SMALL LETTER E', 'COMBINING ACUTE ACCENT'] -} diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs b/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs deleted file mode 100644 index e949e2319..000000000 --- a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs +++ /dev/null @@ -1,4 +0,0 @@ -mod řųśť; //~ trying to load file for -//~^ file not found for - -fn main() {} diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr b/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr deleted file mode 100644 index dd0dac95e..000000000 --- a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr +++ /dev/null @@ -1,20 +0,0 @@ -error[E0583]: file not found for module `řųśť` - --> $DIR/mod_file_nonascii_forbidden.rs:1:1 - | -LL | mod řųśť; - | ^^^^^^^^^ - | - = help: to create the module `řųśť`, create file "$DIR/řųśť.rs" or "$DIR/řųśť/mod.rs" - -error[E0754]: trying to load file for module `řųśť` with non-ascii identifier name - --> $DIR/mod_file_nonascii_forbidden.rs:1:5 - | -LL | mod řųśť; - | ^^^^ - | - = help: consider using `#[path]` attribute to specify filesystem path - -error: aborting due to 2 previous errors - -Some errors have detailed explanations: E0583, E0754. -For more information about an error, try `rustc --explain E0583`. diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs b/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs deleted file mode 100644 index 94327846d..000000000 --- a/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs +++ /dev/null @@ -1,6 +0,0 @@ -// check-pass - -#[path="auxiliary/mod_file_nonascii_with_path_allowed-aux.rs"] -mod řųśť; - -fn main() {} diff --git a/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs b/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs deleted file mode 100644 index e1d836b7c..000000000 --- a/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs +++ /dev/null @@ -1,7 +0,0 @@ -// check-pass - -mod řųśť { - const IS_GREAT: bool = true; -} - -fn main() {} diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs b/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs deleted file mode 100644 index f4c126a6e..000000000 --- a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs +++ /dev/null @@ -1,20 +0,0 @@ -#[no_mangle] -pub fn řųśť() {} //~ `#[no_mangle]` requires ASCII identifier - -pub struct Foo; - -impl Foo { - #[no_mangle] - pub fn řųśť() {} //~ `#[no_mangle]` requires ASCII identifier -} - -trait Bar { - fn řųśť(); -} - -impl Bar for Foo { - #[no_mangle] - fn řųśť() {} //~ `#[no_mangle]` requires ASCII identifier -} - -fn main() {} diff --git a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr b/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr deleted file mode 100644 index 459d5d6b5..000000000 --- a/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr +++ /dev/null @@ -1,21 +0,0 @@ -error[E0754]: `#[no_mangle]` requires ASCII identifier - --> $DIR/no_mangle_nonascii_forbidden.rs:2:1 - | -LL | pub fn řųśť() {} - | ^^^^^^^^^^^^^ - -error[E0754]: `#[no_mangle]` requires ASCII identifier - --> $DIR/no_mangle_nonascii_forbidden.rs:8:5 - | -LL | pub fn řųśť() {} - | ^^^^^^^^^^^^^ - -error[E0754]: `#[no_mangle]` requires ASCII identifier - --> $DIR/no_mangle_nonascii_forbidden.rs:17:5 - | -LL | fn řųśť() {} - | ^^^^^^^^^ - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0754`. -- cgit v1.2.3