about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-17 16:20:19 +0000
committerbors <bors@rust-lang.org>2020-05-17 16:20:19 +0000
commitd79f1bd31a1401b5d08096fcdf9a9eb23ddf95df (patch)
tree3f05098e7dc5e8c5b27b9d2bf6d5e7e91150806c /src/test
parent34cce58d81f006a5406fcae918db4492e6cf2784 (diff)
parent2b3d99d31a0660645cfd338895209da5616a84af (diff)
Auto merge of #72295 - RalfJung:rollup-icmhbs7, r=RalfJung
Rollup of 3 pull requests

Successful merges:

 - #72259 (Disallow forbidden usage of non-ascii identifiers.)
 - #72261 (Break out early on empty span when generate_fn_span)
 - #72291 (bootstrap: fix typo)

Failed merges:

r? @ghost
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs1
-rw-r--r--src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs6
-rw-r--r--src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr20
-rw-r--r--src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs7
-rw-r--r--src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs8
-rw-r--r--src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs6
-rw-r--r--src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr9
7 files changed, 57 insertions, 0 deletions
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
new file mode 100644
index 00000000000..e373b64384f
--- /dev/null
+++ b/src/test/ui/rfc-2457/auxiliary/mod_file_nonascii_with_path_allowed-aux.rs
@@ -0,0 +1 @@
+pub trait Foo {}
diff --git a/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs b/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs
new file mode 100644
index 00000000000..efd2932f152
--- /dev/null
+++ b/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.rs
@@ -0,0 +1,6 @@
+#![feature(non_ascii_idents)]
+
+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
new file mode 100644
index 00000000000..be729836f4f
--- /dev/null
+++ b/src/test/ui/rfc-2457/mod_file_nonascii_forbidden.stderr
@@ -0,0 +1,20 @@
+error[E0583]: file not found for module `řųśť`
+  --> $DIR/mod_file_nonascii_forbidden.rs:3:1
+   |
+LL | mod řųśť;
+   | ^^^^^^^^^
+   |
+   = help: to create the module `řųśť`, create file "$DIR/řųśť.rs"
+
+error[E0754]: trying to load file for module `řųśť` with non ascii identifer name
+  --> $DIR/mod_file_nonascii_forbidden.rs:3: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
new file mode 100644
index 00000000000..e9f3fba2fb0
--- /dev/null
+++ b/src/test/ui/rfc-2457/mod_file_nonascii_with_path_allowed.rs
@@ -0,0 +1,7 @@
+// check-pass
+#![feature(non_ascii_idents)]
+
+#[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
new file mode 100644
index 00000000000..dd27da432ba
--- /dev/null
+++ b/src/test/ui/rfc-2457/mod_inline_nonascii_allowed.rs
@@ -0,0 +1,8 @@
+// check-pass
+#![feature(non_ascii_idents)]
+
+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
new file mode 100644
index 00000000000..a408c975716
--- /dev/null
+++ b/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.rs
@@ -0,0 +1,6 @@
+#![feature(non_ascii_idents)]
+
+#[no_mangle]
+pub 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
new file mode 100644
index 00000000000..4ca83e41032
--- /dev/null
+++ b/src/test/ui/rfc-2457/no_mangle_nonascii_forbidden.stderr
@@ -0,0 +1,9 @@
+error[E0754]: `#[no_mangle]` requires ASCII identifier
+  --> $DIR/no_mangle_nonascii_forbidden.rs:4:1
+   |
+LL | pub fn řųśť() {}
+   | ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0754`.