diff --git a/compiler/rustc_expand/messages.ftl b/compiler/rustc_expand/messages.ftl index e914f24e294cd..c79a9291d0703 100644 --- a/compiler/rustc_expand/messages.ftl +++ b/compiler/rustc_expand/messages.ftl @@ -49,6 +49,9 @@ expand_feature_removed = .note = removed in {$removed_rustc_version}{$pull_note} .reason = {$reason} +expand_file_modules_in_proc_macro_input_are_unstable = + file modules in proc macro input are unstable + expand_glob_delegation_outside_impls = glob delegation is only supported in impls @@ -157,9 +160,6 @@ expand_mve_unrecognized_expr = expand_mve_unrecognized_var = variable `{$key}` is not recognized in meta-variable expression -expand_non_inline_modules_in_proc_macro_input_are_unstable = - non-inline modules in proc macro input are unstable - expand_or_patterns_back_compat = the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro .suggestion = use pat_param to preserve semantics diff --git a/compiler/rustc_expand/src/expand.rs b/compiler/rustc_expand/src/expand.rs index 3dfa3cdcc3560..22c3341e44ec4 100644 --- a/compiler/rustc_expand/src/expand.rs +++ b/compiler/rustc_expand/src/expand.rs @@ -1050,7 +1050,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { self.sess, sym::proc_macro_hygiene, item.span, - fluent_generated::expand_non_inline_modules_in_proc_macro_input_are_unstable, + fluent_generated::expand_file_modules_in_proc_macro_input_are_unstable, ) .emit(); } diff --git a/tests/ui/README.md b/tests/ui/README.md index 3b28ef694dd30..dbc7dde8da586 100644 --- a/tests/ui/README.md +++ b/tests/ui/README.md @@ -432,7 +432,7 @@ Tests for miscellaneous suggestions. ## `tests/ui/directory_ownership/`: Declaring `mod` inside a block -Exercises diagnostics for when a code block attempts to gain ownership of a non-inline module with a `mod` keyword placed inside of it. +Exercises diagnostics for when a code block attempts to gain ownership of a file module with a `mod` keyword placed inside of it. ## `tests/ui/disallowed-deconstructing/`: Incorrect struct deconstruction diff --git a/tests/ui/proc-macro/attributes-on-modules-fail.rs b/tests/ui/proc-macro/attributes-on-modules-fail.rs index 80300b47c5fc1..59da87a1dde16 100644 --- a/tests/ui/proc-macro/attributes-on-modules-fail.rs +++ b/tests/ui/proc-macro/attributes-on-modules-fail.rs @@ -17,11 +17,11 @@ type A = X; //~ ERROR cannot find type `X` in this scope mod n {} #[empty_attr] -mod module; //~ ERROR non-inline modules in proc macro input are unstable +mod module; //~ ERROR file modules in proc macro input are unstable #[empty_attr] mod outer { - mod inner; //~ ERROR non-inline modules in proc macro input are unstable + mod inner; //~ ERROR file modules in proc macro input are unstable mod inner_inline {} // OK } @@ -30,16 +30,16 @@ mod outer { struct S { field: [u8; { #[path = "outer/inner.rs"] - mod inner; //~ ERROR non-inline modules in proc macro input are unstable + mod inner; //~ ERROR file modules in proc macro input are unstable mod inner_inline {} // OK 0 - }] + }], } #[identity_attr] fn f() { #[path = "outer/inner.rs"] - mod inner; //~ ERROR non-inline modules in proc macro input are unstable + mod inner; //~ ERROR file modules in proc macro input are unstable mod inner_inline {} // OK } diff --git a/tests/ui/proc-macro/attributes-on-modules-fail.stderr b/tests/ui/proc-macro/attributes-on-modules-fail.stderr index e69ab78723861..26b20a3ee6cb8 100644 --- a/tests/ui/proc-macro/attributes-on-modules-fail.stderr +++ b/tests/ui/proc-macro/attributes-on-modules-fail.stderr @@ -6,7 +6,7 @@ LL | #[derive(Copy)] LL | mod n {} | -------- not a `struct`, `enum` or `union` -error[E0658]: non-inline modules in proc macro input are unstable +error[E0658]: file modules in proc macro input are unstable --> $DIR/attributes-on-modules-fail.rs:20:1 | LL | mod module; @@ -16,7 +16,7 @@ LL | mod module; = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date -error[E0658]: non-inline modules in proc macro input are unstable +error[E0658]: file modules in proc macro input are unstable --> $DIR/attributes-on-modules-fail.rs:24:5 | LL | mod inner; @@ -26,7 +26,7 @@ LL | mod inner; = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date -error[E0658]: non-inline modules in proc macro input are unstable +error[E0658]: file modules in proc macro input are unstable --> $DIR/attributes-on-modules-fail.rs:33:9 | LL | mod inner; @@ -36,7 +36,7 @@ LL | mod inner; = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date -error[E0658]: non-inline modules in proc macro input are unstable +error[E0658]: file modules in proc macro input are unstable --> $DIR/attributes-on-modules-fail.rs:42:5 | LL | mod inner; diff --git a/tests/ui/proc-macro/inner-attr-non-inline-mod.rs b/tests/ui/proc-macro/inner-attr-file-mod.rs similarity index 86% rename from tests/ui/proc-macro/inner-attr-non-inline-mod.rs rename to tests/ui/proc-macro/inner-attr-file-mod.rs index 2dcdbf3c40226..e592331c2c6db 100644 --- a/tests/ui/proc-macro/inner-attr-non-inline-mod.rs +++ b/tests/ui/proc-macro/inner-attr-file-mod.rs @@ -9,7 +9,7 @@ extern crate test_macros; #[deny(unused_attributes)] mod module_with_attrs; -//~^ ERROR non-inline modules in proc macro input are unstable +//~^ ERROR file modules in proc macro input are unstable //~| ERROR custom inner attributes are unstable fn main() {} diff --git a/tests/ui/proc-macro/inner-attr-non-inline-mod.stderr b/tests/ui/proc-macro/inner-attr-file-mod.stderr similarity index 91% rename from tests/ui/proc-macro/inner-attr-non-inline-mod.stderr rename to tests/ui/proc-macro/inner-attr-file-mod.stderr index c0a9385f4c688..92262284a00c4 100644 --- a/tests/ui/proc-macro/inner-attr-non-inline-mod.stderr +++ b/tests/ui/proc-macro/inner-attr-file-mod.stderr @@ -18,8 +18,8 @@ LL | #![print_attr] = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date -error[E0658]: non-inline modules in proc macro input are unstable - --> $DIR/inner-attr-non-inline-mod.rs:11:1 +error[E0658]: file modules in proc macro input are unstable + --> $DIR/inner-attr-file-mod.rs:11:1 | LL | mod module_with_attrs; | ^^^^^^^^^^^^^^^^^^^^^^ @@ -29,7 +29,7 @@ LL | mod module_with_attrs; = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date error[E0658]: custom inner attributes are unstable - --> $DIR/inner-attr-non-inline-mod.rs:11:1 + --> $DIR/inner-attr-file-mod.rs:11:1 | LL | mod module_with_attrs; | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/proc-macro/inner-attr-non-inline-mod.stdout b/tests/ui/proc-macro/inner-attr-file-mod.stdout similarity index 59% rename from tests/ui/proc-macro/inner-attr-non-inline-mod.stdout rename to tests/ui/proc-macro/inner-attr-file-mod.stdout index 219794a8eb8cd..6f893875657b0 100644 --- a/tests/ui/proc-macro/inner-attr-non-inline-mod.stdout +++ b/tests/ui/proc-macro/inner-attr-file-mod.stdout @@ -4,35 +4,35 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [ Punct { ch: '#', spacing: Alone, - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Group { delimiter: Bracket, stream: TokenStream [ Ident { ident: "deny", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Group { delimiter: Parenthesis, stream: TokenStream [ Ident { ident: "unused_attributes", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, ], - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, ], - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Ident { ident: "mod", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Ident { ident: "module_with_attrs", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Group { delimiter: Brace, @@ -40,38 +40,38 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [ Punct { ch: '#', spacing: Joint, - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Punct { ch: '!', spacing: Alone, - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Group { delimiter: Bracket, stream: TokenStream [ Ident { ident: "rustfmt", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Punct { ch: ':', spacing: Joint, - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Punct { ch: ':', spacing: Alone, - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, Ident { ident: "skip", - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, ], - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, ], - span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0), + span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0), }, ]