[move] support const in const #14223
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
4 Ignored Deployments
|
| let name = match e_ { | ||
| E::Constant(name) => name, | ||
| _ => unreachable!(), |
There was a problem hiding this comment.
minor nit, let else might read better here
There was a problem hiding this comment.
There are several other arms of this match that use a similar let pattern. Should I rewrite them as well?
external-crates/move/move-compiler/src/cfgir/optimize/constant_fold.rs
Outdated
Show resolved
Hide resolved
external-crates/move/move-compiler/tests/move_2024/typing/const_in_const_circular.exp
Outdated
Show resolved
Hide resolved
cgswords
changed the title
| let name = if let E::Constant(name) = e_ { | ||
| name | ||
| } else { | ||
| unreachable!() | ||
| }; |
There was a problem hiding this comment.
Nit: a perfect use-case for let-else IMO
| let name = if let E::Constant(name) = e_ { | |
| name | |
| } else { | |
| unreachable!() | |
| }; | |
| let E::Constant(name) = e_ else { | |
| unreachable!() | |
| }; |
|
@tzakian I'll fix the nits when I get back to the office, but -- doesn't the transactional test I posted do the correct thing for testing they are actually folded? |
Egads you're totally right. For some reason my eyes just went to the expected value files and errors, and I didn't see those. But yes, those are exactly the correct tests so please disregard :) |
| if let Some(mident) = &self.current_module { | ||
| self.module_info(mident).package |
There was a problem hiding this comment.
nit, self.current_module.as_ref().map
## Description Support constants in constants. ## Test Plan Added new tests --- If your changes are not user-facing and not a breaking change, you can skip the following section. Otherwise, please indicate what changed, and then add to the Release Notes section as highlighted during the release process. ### Type of Change (Check all that apply) - [ ] protocol change - [x] user-visible impact - [ ] breaking change for a client SDKs - [ ] breaking change for FNs (FN binary must upgrade) - [ ] breaking change for validators or node operators (must upgrade binaries) - [ ] breaking change for on-chain data layout - [ ] necessitate either a data wipe or data migration ### Release notes The error for using const-in-const changed to point at the feature gating.
Description
Support constants in constants.
Test Plan
Added new tests
If your changes are not user-facing and not a breaking change, you can skip the following section. Otherwise, please indicate what changed, and then add to the Release Notes section as highlighted during the release process.
Type of Change (Check all that apply)
Release notes
The error for using const-in-const changed to point at the feature gating.