Skip to content

Commit 48db527

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#147438 - reddevilmidzy:rename-non-inline-module-in-msg, r=fee1-dead
Rename "non-inline module" to "file module" in proc macro diagnostics This PR updates diagnostic messages to use "file module" instead of "non-inline module". because the term "non-inline module" can be confusing, especially for non-native English speakers. follow up PR rust-lang#147395 related of rust-lang#147314, [#general > Rename "non-inline modules" to "external modules"](https://rust-lang.zulipchat.com/#narrow/channel/122651-general/topic/.E2.9C.94.20Rename.20.22non-inline.20modules.22.20to.20.22external.20modules.22/near/543361244) cc ```@Kivooeo```
2 parents 5559313 + a1a9113 commit 48db527

File tree

7 files changed

+32
-32
lines changed

7 files changed

+32
-32
lines changed

‎compiler/rustc_expand/messages.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ expand_feature_removed =
4949
.note = removed in {$removed_rustc_version}{$pull_note}
5050
.reason = {$reason}
5151
52+
expand_file_modules_in_proc_macro_input_are_unstable =
53+
file modules in proc macro input are unstable
54+
5255
expand_glob_delegation_outside_impls =
5356
glob delegation is only supported in impls
5457
@@ -158,9 +161,6 @@ expand_mve_unrecognized_expr =
158161
expand_mve_unrecognized_var =
159162
variable `{$key}` is not recognized in meta-variable expression
160163
161-
expand_non_inline_modules_in_proc_macro_input_are_unstable =
162-
non-inline modules in proc macro input are unstable
163-
164164
expand_or_patterns_back_compat = the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
165165
.suggestion = use pat_param to preserve semantics
166166

‎compiler/rustc_expand/src/expand.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
10501050
self.sess,
10511051
sym::proc_macro_hygiene,
10521052
item.span,
1053-
fluent_generated::expand_non_inline_modules_in_proc_macro_input_are_unstable,
1053+
fluent_generated::expand_file_modules_in_proc_macro_input_are_unstable,
10541054
)
10551055
.emit();
10561056
}

‎tests/ui/proc-macro/attributes-on-modules-fail.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ type A = X; //~ ERROR cannot find type `X` in this scope
1717
mod n {}
1818

1919
#[empty_attr]
20-
mod module; //~ ERROR non-inline modules in proc macro input are unstable
20+
mod module; //~ ERROR file modules in proc macro input are unstable
2121

2222
#[empty_attr]
2323
mod outer {
24-
mod inner; //~ ERROR non-inline modules in proc macro input are unstable
24+
mod inner; //~ ERROR file modules in proc macro input are unstable
2525

2626
mod inner_inline {} // OK
2727
}
@@ -30,16 +30,16 @@ mod outer {
3030
struct S {
3131
field: [u8; {
3232
#[path = "outer/inner.rs"]
33-
mod inner; //~ ERROR non-inline modules in proc macro input are unstable
33+
mod inner; //~ ERROR file modules in proc macro input are unstable
3434
mod inner_inline {} // OK
3535
0
36-
}]
36+
}],
3737
}
3838

3939
#[identity_attr]
4040
fn f() {
4141
#[path = "outer/inner.rs"]
42-
mod inner; //~ ERROR non-inline modules in proc macro input are unstable
42+
mod inner; //~ ERROR file modules in proc macro input are unstable
4343
mod inner_inline {} // OK
4444
}
4545

‎tests/ui/proc-macro/attributes-on-modules-fail.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | #[derive(Copy)]
66
LL | mod n {}
77
| -------- not a `struct`, `enum` or `union`
88

9-
error[E0658]: non-inline modules in proc macro input are unstable
9+
error[E0658]: file modules in proc macro input are unstable
1010
--> $DIR/attributes-on-modules-fail.rs:20:1
1111
|
1212
LL | mod module;
@@ -16,7 +16,7 @@ LL | mod module;
1616
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
1717
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
1818

19-
error[E0658]: non-inline modules in proc macro input are unstable
19+
error[E0658]: file modules in proc macro input are unstable
2020
--> $DIR/attributes-on-modules-fail.rs:24:5
2121
|
2222
LL | mod inner;
@@ -26,7 +26,7 @@ LL | mod inner;
2626
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
2727
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2828

29-
error[E0658]: non-inline modules in proc macro input are unstable
29+
error[E0658]: file modules in proc macro input are unstable
3030
--> $DIR/attributes-on-modules-fail.rs:33:9
3131
|
3232
LL | mod inner;
@@ -36,7 +36,7 @@ LL | mod inner;
3636
= help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
3737
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3838

39-
error[E0658]: non-inline modules in proc macro input are unstable
39+
error[E0658]: file modules in proc macro input are unstable
4040
--> $DIR/attributes-on-modules-fail.rs:42:5
4141
|
4242
LL | mod inner;

‎tests/ui/proc-macro/inner-attr-non-inline-mod.rs‎ renamed to ‎tests/ui/proc-macro/inner-attr-file-mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern crate test_macros;
99

1010
#[deny(unused_attributes)]
1111
mod module_with_attrs;
12-
//~^ ERROR non-inline modules in proc macro input are unstable
12+
//~^ ERROR file modules in proc macro input are unstable
1313
//~| ERROR custom inner attributes are unstable
1414

1515
fn main() {}

‎tests/ui/proc-macro/inner-attr-non-inline-mod.stderr‎ renamed to ‎tests/ui/proc-macro/inner-attr-file-mod.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ LL | #![print_attr]
1818
= help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable
1919
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2020

21-
error[E0658]: non-inline modules in proc macro input are unstable
22-
--> $DIR/inner-attr-non-inline-mod.rs:11:1
21+
error[E0658]: file modules in proc macro input are unstable
22+
--> $DIR/inner-attr-file-mod.rs:11:1
2323
|
2424
LL | mod module_with_attrs;
2525
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -29,7 +29,7 @@ LL | mod module_with_attrs;
2929
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
3030

3131
error[E0658]: custom inner attributes are unstable
32-
--> $DIR/inner-attr-non-inline-mod.rs:11:1
32+
--> $DIR/inner-attr-file-mod.rs:11:1
3333
|
3434
LL | mod module_with_attrs;
3535
| ^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/proc-macro/inner-attr-non-inline-mod.stdout‎ renamed to ‎tests/ui/proc-macro/inner-attr-file-mod.stdout‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,74 +4,74 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
44
Punct {
55
ch: '#',
66
spacing: Alone,
7-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
7+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
88
},
99
Group {
1010
delimiter: Bracket,
1111
stream: TokenStream [
1212
Ident {
1313
ident: "deny",
14-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
14+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
1515
},
1616
Group {
1717
delimiter: Parenthesis,
1818
stream: TokenStream [
1919
Ident {
2020
ident: "unused_attributes",
21-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
21+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
2222
},
2323
],
24-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
24+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
2525
},
2626
],
27-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
27+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
2828
},
2929
Ident {
3030
ident: "mod",
31-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
31+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
3232
},
3333
Ident {
3434
ident: "module_with_attrs",
35-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
35+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
3636
},
3737
Group {
3838
delimiter: Brace,
3939
stream: TokenStream [
4040
Punct {
4141
ch: '#',
4242
spacing: Joint,
43-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
43+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
4444
},
4545
Punct {
4646
ch: '!',
4747
spacing: Alone,
48-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
48+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
4949
},
5050
Group {
5151
delimiter: Bracket,
5252
stream: TokenStream [
5353
Ident {
5454
ident: "rustfmt",
55-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
55+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
5656
},
5757
Punct {
5858
ch: ':',
5959
spacing: Joint,
60-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
60+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
6161
},
6262
Punct {
6363
ch: ':',
6464
spacing: Alone,
65-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
65+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
6666
},
6767
Ident {
6868
ident: "skip",
69-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
69+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
7070
},
7171
],
72-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
72+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
7373
},
7474
],
75-
span: $DIR/inner-attr-non-inline-mod.rs:11:1: 11:23 (#0),
75+
span: $DIR/inner-attr-file-mod.rs:11:1: 11:23 (#0),
7676
},
7777
]

0 commit comments

Comments
 (0)