Skip to content

Use ? in core/std macros - #78375

Merged
bors merged 1 commit into
rust-lang:masterfrom
taiki-e:question-in-macros
Oct 27, 2020
Merged

Use ? in core/std macros#78375
bors merged 1 commit into
rust-lang:masterfrom
taiki-e:question-in-macros

Conversation

@taiki-e

Copy link
Copy Markdown
Member

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @kennytm

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 25, 2020
@camelid

Copy link
Copy Markdown
Member

(Note that this appears to be specifically using ? to allow optional trailing commas.)

@camelidcamelid added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api [DEPRECATED; DO NOT USE] labels Oct 26, 2020
@jyn514jyn514 changed the title Use ? in core/std macrosAllow trailing commas in core/std macrosOct 26, 2020
@taiki-e

Copy link
Copy Markdown
MemberAuthor

@camelid This PR does not change any behavior, trailing commas are allowed in core/std macros since #48056.

@taiki-etaiki-e changed the title Allow trailing commas in core/std macrosUse ? in core/std macrosOct 26, 2020
$crate::panic!("explicit panic")
);
($msg:literal) => (
($msg:literal $(,)?) => (

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no ($msg:literal,) => ($panic!($msg)) in the previous code, but this seems previously covered by ($msg:expr,) => ($panic!($msg)).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's what confused me then.

@kennytm

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Oct 26, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 04c0018 has been approved by kennytm

@borsbors 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 Oct 26, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 26, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 27, 2020
Rollup of 16 pull requests
Successful merges:
- rust-lang#76635 (Add [T]::as_chunks(_mut))
- rust-lang#77703 (add system-llvm-libunwind config option)
- rust-lang#78219 (Prefer to use `print_def_path`)
- rust-lang#78298 (Add test for bad NLL higher-ranked subtype)
- rust-lang#78332 (Update description for error E0308)
- rust-lang#78342 (Use check-pass in single-use-lifetime ui tests)
- rust-lang#78347 (Add lexicographical comparison doc)
- rust-lang#78348 (Make some functions private that don't have to be public)
- rust-lang#78349 (Use its own `TypeckResults` to avoid ICE)
- rust-lang#78375 (Use ? in core/std macros)
- rust-lang#78377 (Fix typo in debug statement)
- rust-lang#78388 (Add some regression tests)
- rust-lang#78394 (fix(docs): typo in BufWriter documentation)
- rust-lang#78396 (Add compiler support for LLVM's x86_64 ERMSB feature)
- rust-lang#78405 (Fix typo in lint description)
- rust-lang#78412 (Improve formatting of hash collections docs)
Failed merges:
r? `@ghost`
@bors
bors merged commit 5a33fa5 into rust-lang:masterOct 27, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 27, 2020
@taiki-e
taiki-e deleted the question-in-macros branch October 27, 2020 04:05
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libs-api[DEPRECATED; DO NOT USE]

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@taiki-e@rust-highfive@camelid@kennytm@bors@rustbot