Skip to content
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.

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

fix: Fix incorrect type mismatch with cfg_if! and other macros in expression position #13027

Merged
merged 1 commit into from
Aug 15, 2022
Merged

fix: Fix incorrect type mismatch with cfg_if! and other macros in expression position #13027

merged 1 commit into from
Aug 15, 2022

Conversation

jonas-schievink
Copy link
Contributor

Fixes #12940

This is a bit of a hack, ideally MacroStmts would not exist at all after HIR lowering, but that requires changing how the lowering code works.

@jonas-schievink
Copy link
Contributor Author

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 15, 2022

📌 Commit 13009d3 has been approved by jonas-schievink

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 15, 2022

⌛ Testing commit 13009d3 with merge 7a1403e...

bors added a commit that referenced this pull request Aug 15, 2022
…ty-macro, r=jonas-schievink

fix: Fix incorrect type mismatch with `cfg_if!` and other macros in expression position

Fixes #12940

This is a bit of a hack, ideally `MacroStmts` would not exist at all after HIR lowering, but that requires changing how the lowering code works.
@bors
Copy link
Collaborator

bors commented Aug 15, 2022

💔 Test failed - checks-actions

@jonas-schievink
Copy link
Contributor Author

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 15, 2022

📌 Commit 8c60813 has been approved by jonas-schievink

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Aug 15, 2022

⌛ Testing commit 8c60813 with merge 3903243...

@bors
Copy link
Collaborator

bors commented Aug 15, 2022

☀️ Test successful - checks-actions
Approved by: jonas-schievink
Pushing 3903243 to master...

@bors bors merged commit 3903243 into rust-lang:master Aug 15, 2022
@jonas-schievink jonas-schievink deleted the fix-mismatch-with-trailing-empty-macro branch August 15, 2022 16:17
@lnicola
Copy link
Member

lnicola commented Aug 15, 2022

Sadly, this brought back the unknown types in sourcegen_ast 😆.

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong type mismatch with cfg_if! in function body
3 participants