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.

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

GRAM&ANN: Support inline_const and inline_const_pat features #8441

Merged
merged 2 commits into from Jan 21, 2022
Merged

GRAM&ANN: Support inline_const and inline_const_pat features #8441

merged 2 commits into from Jan 21, 2022

Conversation

mchernyavsky
Copy link
Member

changelog: Support inline_const and inline_const_pat features

@mchernyavsky mchernyavsky added this to In Progress in To test via automation Jan 21, 2022
vlad20012
vlad20012 approved these changes Jan 21, 2022
View reviewed changes
Copy link
Member

@vlad20012 vlad20012 left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Contributor

bors bot commented Jan 21, 2022

Build succeeded:

@bors bors bot merged commit bcafe97 into master Jan 21, 2022
To test automation moved this from In Progress to Test Jan 21, 2022
@bors bors bot deleted the inline-const branch January 21, 2022 18:09
@github-actions github-actions bot added this to the v164 milestone Jan 21, 2022
kumbayo
kumbayo reviewed Jan 23, 2022
View reviewed changes
src/main/kotlin/org/rust/lang/core/stubs/StubImplementations.kt
@@ -1960,6 +1961,7 @@ class RsBlockExprStub(
flags = BitUtil.set(flags, UNSAFE_MASK, psi.isUnsafe)
flags = BitUtil.set(flags, ASYNC_MASK, psi.isAsync)
flags = BitUtil.set(flags, TRY_MASK, psi.isTry)
flags = BitUtil.set(flags, TRY_MASK, psi.isConst)
Copy link
Contributor

Choose a reason for hiding this comment

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

@mchernyavsky This looks like it should be CONST_MASK instead?

Copy link
Member

Choose a reason for hiding this comment

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

Oh shit.
@kumbayo thanks!

@mchernyavsky mchernyavsky mentioned this pull request Jan 24, 2022
Merged
bors bot added a commit that referenced this pull request Jan 24, 2022
@bors @mchernyavsky
Merge #8453
938ce02 
8453: ANN: Fix stub for const block expressions r=mchernyavsky a=mchernyavsky

Relates to #8441.


Co-authored-by: mhernyavsky <chernyavsky.mikhail@gmail.com>
@mili-l mili-l self-assigned this Jan 25, 2022
@mili-l mili-l moved this from Test to Done in To test Jan 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kumbayo kumbayo kumbayo left review comments

@vlad20012 vlad20012 vlad20012 approved these changes

Assignees

@mili-l mili-l

@vlad20012 vlad20012

Labels
feature
Projects
To test
  
Done
Milestone
v164
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mchernyavsky @kumbayo @vlad20012 @mili-l