Add check for invalid #[macro_export] arguments #107911

blyxyas · 2023-02-10T23:56:27Z

Resolves #107231
Sorry if I made something wrong, this is my first contribution to the repo.

rustbot · 2023-02-10T23:56:34Z

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-02-10T23:56:38Z

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

compiler-errors · 2023-02-10T23:58:23Z

two things about the title - 1. it doesn't need the issue number in the title, and 2. can you make it more "functional"? like, what does it do? e.g. "add a check for invalid macro_export arguments" or something.

compiler/rustc_error_messages/locales/en-US/passes.ftl

compiler/rustc_passes/src/check_attr.rs

compiler-errors · 2023-02-12T01:16:43Z

compiler/rustc_lint_defs/src/builtin.rs

+    ///
+    pub INVALID_MACRO_EXPORT_ARGUMENTS,
+    Deny,
+    "There aren't any attributes named \"invalid_parameters\"",


Why does this message reference "invalid_parameters"?

compiler-errors · 2023-02-12T01:17:40Z

compiler/rustc_passes/src/check_attr.rs

+                attr.span,
+                errors::MacroExport::Normal,
+            );
+        } else if let Some(meta_item_list) = attr.meta_item_list() {


What if it's a #[macro_export = ".."]?

When testing this:

error: malformed `macro_export` attribute input --> fake-test-src-base/invalid_macro_export_argument.rs:31:1 | LL | #[macro_export = "Not a valid value"] //~ WARN `not_local_inner_macros` isn't a valid `#[macro_export]` argument | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |

It seems like Rust already gives an error in that case.When testing this:

error: malformed `macro_export` attribute input --> fake-test-src-base/invalid_macro_export_argument.rs:31:1 | LL | #[macro_export = "Not a valid value"] //~ WARN `not_local_inner_macros` isn't a valid `#[macro_export]` argument | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |

It seems like Rust already gives an error in that case.

compiler-errors · 2023-02-12T01:19:38Z

compiler/rustc_lint_defs/src/builtin.rs

+    ///
+    ///
+    pub INVALID_MACRO_EXPORT_ARGUMENTS,
+    Deny,


This needs to start out at a warn level, not Deny, or else it'll break a bunch of crates that are using this incorrectly currently.

Ok
Does this need a future incompatible warn?

That can be added in a follow-up

compiler/rustc_lint_defs/src/builtin.rs

blyxyas · 2023-02-14T13:19:52Z

The code is all fixed, but testing gives an error and I don't know why. The stderr doesn't show any diff and cannot see what I'm doing wrong.

With these input: TESTNAME="invalid_macro_export_argument" x test tests/ui
it gives the following output:

Output

failures:

---- [ui] tests/ui/invalid_macro_export_argument.rs stdout ----

error: ui test compiled successfully!
status: exit status: 0
command: "/home/alejandra/git/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/alejandra/git/rust/tests/ui/invalid_macro_export_argument.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/home/alejandra/git/rust/tests/ui=fake-test-src-base" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/home/alejandra/git/rust/build/x86_64-unknown-linux-gnu/test/ui/invalid_macro_export_argument" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/home/alejandra/git/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/alejandra/git/rust/build/x86_64-unknown-linux-gnu/test/ui/invalid_macro_export_argument/auxiliary"
stdout: none
--- stderr -------------------------------
warning: `#[macro_export]` can only take 1 or 0 arguments
  --> fake-test-src-base/invalid_macro_export_argument.rs:1:1
   |
LL | #[macro_export(hello, world)] //~ WARN `#[macro_export]` can only take 1 or 0 arguments
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(invalid_macro_export_arguments)]` on by default

warning: `not_local_inner_macros` isn't a valid `#[macro_export]` argument
  --> fake-test-src-base/invalid_macro_export_argument.rs:6:16
   |
LL | #[macro_export(not_local_inner_macros)] //~ WARN `not_local_inner_macros` isn't a valid `#[macro_export]` argument
   |                ^^^^^^^^^^^^^^^^^^^^^^

warning: 2 warnings emitted
------------------------------------------



failures:
    [ui] tests/ui/invalid_macro_export_argument.rs

test result: FAILED. 4 passed; 1 failed; 14429 ignored; 0 measured; 0 filtered out; finished in 0.23s

Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
Build completed unsuccessfully in 0:00:02

The lint level has been changed to a Warn level, so I changed //~ ERROR to //~ WARN and it still gives me an error (without any diffs).

Is there something that I'm doing wrong?

compiler-errors · 2023-02-14T17:06:16Z

If you make it a warning, then you need to mark the test with // check-pass, or else we expect a failure. You can also just add a #![deny(invalid_macro_export_arguments)] to make them into an error just for your UI test.

blyxyas · 2023-02-16T18:27:38Z

@rustbot label: -S-waiting-on-author +S-waiting-on-review

compiler-errors · 2023-02-16T18:38:48Z

Can you squash these into one commit? I think this is ready to go after that.

compiler-errors · 2023-02-22T05:19:21Z

Whoops, sorry, forgot to approve.

r? @compiler-errors @bors r+

bors · 2023-02-22T05:19:23Z

📌 Commit 05838b5 has been approved by compiler-errors

It is now in the queue for this repository.

…er-errors Add check for invalid #[macro_export] arguments Resolves rust-lang#107231 Sorry if I made something wrong, this is my first contribution to the repo.

blyxyas · 2023-02-22T21:41:27Z

@rustbot label: -T-bootstrap

rustbot · 2023-02-22T21:44:40Z

Some changes occurred in src/tools/cargo

cc @ehuss

blyxyas · 2023-02-22T21:45:33Z

@rustbot label: -T-bootstrap
Sorry to Eric Huss for the mention. Im fighting with Git right now trying to resolve the conflict.

compiler-errors · 2023-02-22T21:46:11Z

@blyxyas, I can push to your branch and rebase this if you're having trouble.

blyxyas · 2023-02-22T21:50:33Z

I'd appreciate that a lot. Thanks

compiler-errors · 2023-02-22T22:00:42Z

I'll wait for CI to check this PR, then I can re-approve.

In the future, git pull --rebase origin master (or instead of origin, whatever your remote for rust-lang/rust.git is called) is the easiest way to rebase past things like this. Submodules can be a pain though.

compiler-errors · 2023-02-23T18:38:36Z

@bors r+

bors · 2023-02-23T18:38:38Z

📌 Commit e39fe37 has been approved by compiler-errors

It is now in the queue for this repository.

…er-errors Add check for invalid #[macro_export] arguments Resolves rust-lang#107231 Sorry if I made something wrong, this is my first contribution to the repo.

compiler-errors · 2023-02-25T19:51:39Z

@bors rollup

…mpiler-errors Rollup of 7 pull requests Successful merges: - rust-lang#105736 (Test that the compiler/library builds with validate-mir) - rust-lang#107291 ([breaking change] Remove a rustdoc back compat warning) - rust-lang#107675 (Implement -Zlink-directives=yes/no) - rust-lang#107848 (Split `x setup` sub-actions to CLI arguments) - rust-lang#107911 (Add check for invalid #[macro_export] arguments) - rust-lang#108229 ([107049] Recognise top level keys in config.toml.example) - rust-lang#108333 (Make object bound candidates sound in the new trait solver) Failed merges: - rust-lang#108337 (hir-analysis: make a helpful note) r? `@ghost` `@rustbot` modify labels: rollup

This fixes build failure with Rust 1.69+. According to [^1], "the only valid argument is `#[macro_export(local_inner_macros)]` or no argument (`#[macro_export]`)". The check for invalid `#[macro_export]` arguments was added in rust-lang/rust#107911 and first released in Rust 1.69.0. [^1]: https://github.com/rust-lang/rust/blob/1.69.0/compiler/rustc_lint_defs/src/builtin.rs#L4129 Signed-off-by: Ruoyu Zhong <[email protected]>

This fixes build failure with Rust 1.69+. According to [^1], "the only valid argument is `#[macro_export(local_inner_macros)]` or no argument (`#[macro_export]`)". The check for invalid `#[macro_export]` arguments was added in rust-lang/rust#107911 and first released in Rust 1.69.0. [^1]: https://github.com/rust-lang/rust/blob/1.69.0/compiler/rustc_lint_defs/src/builtin.rs#L4129 Signed-off-by: Ruoyu Zhong <[email protected]> Signed-off-by: fn500i <[email protected]>

rustbot assigned TaKO8Ki Feb 10, 2023

blyxyas changed the title ~~[#107231] Fix issue~~ [#107231] Fix #[macro_export(invalid, arguments)] issue Feb 10, 2023

blyxyas changed the title ~~[#107231] Fix #[macro_export(invalid, arguments)] issue~~ Add check for invalid #[macro_export] arguments Feb 10, 2023

clubby789 reviewed Feb 11, 2023

View reviewed changes

compiler/rustc_error_messages/locales/en-US/passes.ftl Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

compiler-errors reviewed Feb 12, 2023

View reviewed changes

compiler-errors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 14, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2023

rustbot assigned compiler-errors and unassigned TaKO8Ki Feb 22, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2023

matthiaskrgr mentioned this pull request Feb 22, 2023

Rollup of 7 pull requests #108336

Closed

rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) and removed T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 22, 2023

rustbot removed the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Feb 22, 2023

Add check for invalid \#[macro_export]\ arguments

e39fe37

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 23, 2023

matthiaskrgr mentioned this pull request Feb 23, 2023

Rollup of 8 pull requests #108413

Closed

compiler-errors mentioned this pull request Feb 25, 2023

Rollup of 7 pull requests #108464

Merged

bors merged commit cf049ac into rust-lang:master Feb 26, 2023

rustbot added this to the 1.69.0 milestone Feb 26, 2023

ZhongRuoyu mentioned this pull request May 1, 2023

Fix invalid macro_export usage tremor-rs/tremor-runtime#2320

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add check for invalid #[macro_export] arguments #107911

Add check for invalid #[macro_export] arguments #107911

blyxyas commented Feb 10, 2023

rustbot commented Feb 10, 2023

rustbot commented Feb 10, 2023

compiler-errors commented Feb 10, 2023 •

edited

Loading

This comment has been minimized.

compiler-errors Feb 12, 2023

blyxyas Feb 16, 2023

compiler-errors Feb 12, 2023

blyxyas Feb 15, 2023

compiler-errors Feb 12, 2023

blyxyas Feb 12, 2023

compiler-errors Feb 14, 2023

blyxyas commented Feb 14, 2023 •

edited

Loading

compiler-errors commented Feb 14, 2023

blyxyas commented Feb 16, 2023

compiler-errors commented Feb 16, 2023

compiler-errors commented Feb 22, 2023

bors commented Feb 22, 2023

blyxyas commented Feb 22, 2023

rustbot commented Feb 22, 2023

blyxyas commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

blyxyas commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

compiler-errors commented Feb 23, 2023

bors commented Feb 23, 2023

compiler-errors commented Feb 25, 2023

Add check for invalid #[macro_export] arguments #107911

Add check for invalid #[macro_export] arguments #107911

Conversation

blyxyas commented Feb 10, 2023

rustbot commented Feb 10, 2023

rustbot commented Feb 10, 2023

compiler-errors commented Feb 10, 2023 • edited Loading

This comment has been minimized.

compiler-errors Feb 12, 2023

Choose a reason for hiding this comment

blyxyas Feb 16, 2023

Choose a reason for hiding this comment

compiler-errors Feb 12, 2023

Choose a reason for hiding this comment

blyxyas Feb 15, 2023

Choose a reason for hiding this comment

compiler-errors Feb 12, 2023

Choose a reason for hiding this comment

blyxyas Feb 12, 2023

Choose a reason for hiding this comment

compiler-errors Feb 14, 2023

Choose a reason for hiding this comment

blyxyas commented Feb 14, 2023 • edited Loading

compiler-errors commented Feb 14, 2023

blyxyas commented Feb 16, 2023

compiler-errors commented Feb 16, 2023

compiler-errors commented Feb 22, 2023

bors commented Feb 22, 2023

blyxyas commented Feb 22, 2023

rustbot commented Feb 22, 2023

blyxyas commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

blyxyas commented Feb 22, 2023

compiler-errors commented Feb 22, 2023

compiler-errors commented Feb 23, 2023

bors commented Feb 23, 2023

compiler-errors commented Feb 25, 2023

compiler-errors commented Feb 10, 2023 •

edited

Loading

blyxyas commented Feb 14, 2023 •

edited

Loading