Skip to content

fix check macro expansion #107124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 21, 2023
Merged

fix check macro expansion #107124

merged 1 commit into from
Jan 21, 2023

Conversation

@DebugSteven
Copy link
Contributor

@DebugSteven DebugSteven commented Jan 20, 2023

If the only argument to check! is the module name I get this error:

error: expected expression, found `,` --> src/tools/tidy/src/main.rs:63:42 | 57 | / macro_rules! check { 58 | | ($p:ident $(, $args:expr)* ) => { 59 | | drain_handles(&mut handles); 60 | | ... | 63 | | $p::check($($args),* , &mut flag); | | ^ expected expression ... | 69 | | } 70 | | } | |_________- in this expansion of `check!` ... 117 | check!(hey); | ----------- in this macro invocation

This change makes it so commas are added only when there are args.

r? @albertlarsan68
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2023

Failed to set assignee to albertlarsan68: invalid assignee

Note: Only org members, users with write permissions, or people who have commented on the PR may be assigned.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2023
@DebugSteven
Copy link
Contributor Author

DebugSteven commented Jan 20, 2023

r? @albertlarsan68

I'm gonna try again just in case...
@rustbot
Copy link
Collaborator

rustbot commented Jan 20, 2023

Failed to set assignee to albertlarsan68: invalid assignee

Note: Only org members, users with write permissions, or people who have commented on the PR may be assigned.
@albertlarsan68
Copy link
Member

albertlarsan68 commented Jan 20, 2023

r? @albertlarsan68
@albertlarsan68
Copy link
Member

albertlarsan68 commented Jan 20, 2023

Thanks !
@bors r+ rollup
@bors
Copy link
Collaborator

bors commented Jan 20, 2023

📌 Commit a641b92 has been approved by albertlarsan68

It is now in the queue for this repository.
@bors 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 Jan 20, 2023
@compiler-errors compiler-errors mentioned this pull request Jan 20, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 20, 2023
@compiler-errors
Rollup merge of rust-lang#107124 - DebugSteven:check-macro-expansion,…
222510e 
… r=albertlarsan68 fix check macro expansion If the only argument to `check!` is the module name I get this error: ``` error: expected expression, found `,` --> src/tools/tidy/src/main.rs:63:42 | 57 | / macro_rules! check { 58 | | ($p:ident $(, $args:expr)* ) => { 59 | | drain_handles(&mut handles); 60 | | ... | 63 | | $p::check($($args),* , &mut flag); | | ^ expected expression ... | 69 | | } 70 | | } | |_________- in this expansion of `check!` ... 117 | check!(hey); | ----------- in this macro invocation ``` This change makes it so commas are added only when there are `args`. r? `@albertlarsan68`
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 20, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 20, 2023
@matthiaskrgr
Rollup merge of rust-lang#107124 - DebugSteven:check-macro-expansion,…
2d2e629 
… r=albertlarsan68 fix check macro expansion If the only argument to `check!` is the module name I get this error: ``` error: expected expression, found `,` --> src/tools/tidy/src/main.rs:63:42 | 57 | / macro_rules! check { 58 | | ($p:ident $(, $args:expr)* ) => { 59 | | drain_handles(&mut handles); 60 | | ... | 63 | | $p::check($($args),* , &mut flag); | | ^ expected expression ... | 69 | | } 70 | | } | |_________- in this expansion of `check!` ... 117 | check!(hey); | ----------- in this macro invocation ``` This change makes it so commas are added only when there are `args`. r? ``@albertlarsan68``
@compiler-errors compiler-errors mentioned this pull request Jan 21, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 21, 2023
@bors
Auto merge of rust-lang#107143 - compiler-errors:rollup-zabvmo5, r=co…
e098eb1 
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#104154 (Change `bindings_with_variant_name` to deny-by-default) - rust-lang#104347 (diagnostics: suggest changing `s@self::{macro}`@::macro`` for exported) - rust-lang#104672 (Unify stable and unstable sort implementations in same core module) - rust-lang#107048 (check for x version updates) - rust-lang#107061 (Implement some more new solver candidates and fix some bugs) - rust-lang#107095 (rustdoc: remove redundant CSS selector `.sidebar .current`) - rust-lang#107112 (Fix typo in opaque_types.rs) - rust-lang#107124 (fix check macro expansion) - rust-lang#107131 (rustdoc: use CSS inline layout for radio line instead of flexbox) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
@bors bors merged commit a4f0126 into rust-lang:master Jan 21, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

4 participants

@DebugSteven @rustbot @albertlarsan68 @bors