Skip to content

Do not consider using a semicolon inside of a different-crate macro#82090

Merged
bors merged 1 commit intorust-lang:masterfrom
notriddle:consider-using-a-semicolon-here
Feb 25, 2021
Merged

Do not consider using a semicolon inside of a different-crate macro#82090
bors merged 1 commit intorust-lang:masterfrom
notriddle:consider-using-a-semicolon-here

Conversation

@notriddle
Copy link
Contributor

@notriddle notriddle commented Feb 14, 2021

Fixes #81943

@rust-highfive
Copy link
Contributor

rust-highfive commented Feb 14, 2021

r? @petrochenkov

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 14, 2021
@notriddle notriddle force-pushed the consider-using-a-semicolon-here branch from 0270628 to 0cc6d2e Compare February 14, 2021 08:34
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Feb 14, 2021
View reviewed changes
@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 14, 2021

r? @estebank

@notriddle notriddle force-pushed the consider-using-a-semicolon-here branch from 15bf848 to ba6c648 Compare February 18, 2021 22:55
@estebank
Copy link
Contributor

estebank commented Feb 22, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 22, 2021

📌 Commit ba6c648 has been approved by estebank

@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 Feb 22, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 23, 2021
@Dylan-DPC
Rollup merge of rust-lang#82090 - notriddle:consider-using-a-semicolo…
502ac07 
…n-here, r=estebank

Do not consider using a semicolon inside of a different-crate macro

Fixes rust-lang#81943
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 23, 2021
Closed
@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Feb 23, 2021

failed in rollup

@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Feb 23, 2021

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 23, 2021
@notriddle notriddle force-pushed the consider-using-a-semicolon-here branch from ba6c648 to b6a4e6b Compare February 23, 2021 18:42
@notriddle
Copy link
Contributor Author

notriddle commented Feb 23, 2021

Okay, I've rebased onto master, and also made the test slightly more robust (it uses its own macro, instead of using dbg!, which might change).

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

@notriddle
Copy link
Contributor Author

notriddle commented Feb 23, 2021

@rustbot modify labels: -S-waiting-on-author +S-waiting-on-review

@rustbot 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 23, 2021
@notriddle
Copy link
Contributor Author

notriddle commented Feb 23, 2021 •
edited
Loading 

LL |   f(|x| match x { tmp => { g(tmp) } };);
   |                                      ^

I know that's technically a different bug (doesn't have anything to do with macros at all), but if you apply that suggestion, you get a syntax error

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@estebank
Copy link
Contributor

estebank commented Feb 23, 2021 

tidy error: /checkout/src/test/ui/typeck/auxiliary/issue-81943-lib.rs: too many trailing newlines (2)
some tidy checks failed

@notriddle notriddle force-pushed the consider-using-a-semicolon-here branch from b6a4e6b to de6f1b8 Compare February 23, 2021 19:04
@notriddle
Copy link
Contributor Author

notriddle commented Feb 23, 2021

Okay, I've set up a commit hook for tidy. That should be the last of these sorts of errors.

@estebank
Copy link
Contributor

estebank commented Feb 24, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 24, 2021

📌 Commit de6f1b8 has been approved by estebank

@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 Feb 24, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 24, 2021
@Dylan-DPC
Rollup merge of rust-lang#82090 - notriddle:consider-using-a-semicolo…
d3e3d58 
…n-here, r=estebank

Do not consider using a semicolon inside of a different-crate macro

Fixes rust-lang#81943
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 24, 2021
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 24, 2021
@Dylan-DPC
Rollup merge of rust-lang#82090 - notriddle:consider-using-a-semicolo…
4c054e1 
…n-here, r=estebank

Do not consider using a semicolon inside of a different-crate macro

Fixes rust-lang#81943
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 24, 2021
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 25, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2021
@bors
Auto merge of rust-lang#82517 - Dylan-DPC:rollup-a1958gb, r=Dylan-DPC
0ab7c1d 
Rollup of 16 pull requests

Successful merges:

 - rust-lang#75807 (Convert core/num/mod.rs to intra-doc links)
 - rust-lang#80534 (Use #[doc = include_str!()] in std)
 - rust-lang#80553 (Add an impl of Error on `Arc<impl Error>`.)
 - rust-lang#81167 (Make ptr::write const)
 - rust-lang#81575 (rustdoc: Name fields of `ResolutionFailure::WrongNamespace`)
 - rust-lang#81713 (Account for associated consts in the "unstable assoc item name colission" lint)
 - rust-lang#82078 (Make char and u8 methods const)
 - rust-lang#82087 (Fix ICE caused by suggestion with no code substitutions)
 - rust-lang#82090 (Do not consider using a semicolon inside of a different-crate macro)
 - rust-lang#82213 (Slices for vecs)
 - rust-lang#82214 (Remove redundant to_string calls)
 - rust-lang#82220 (fix the false 'defined here' messages)
 - rust-lang#82313 (Update normalize.css to 8.0.1)
 - rust-lang#82321 (AST: Remove some unnecessary boxes)
 - rust-lang#82364 (Improve error msgs when found type is deref of expected)
 - rust-lang#82514 (Update Clippy)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6b06e57 into rust-lang:master Feb 25, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 25, 2021
@notriddle notriddle deleted the consider-using-a-semicolon-here branch February 25, 2021 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@estebank estebank

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

"consider using a semicolon here" when ; is present with dbg!() inside inspect()

8 participants

@notriddle @rust-highfive @rust-log-analyzer @petrochenkov @estebank @bors @Dylan-DPC-zz @rustbot