refactor(hydroflow_plus): split up location module and store locations directly in streams #1523
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying hydroflow with
|
| Latest commit: |
486e945
|
| Status: | ⚡️ Build in progress... |
shadaj
force-pushed
the
pr1523
branch
3 times, most recently
from
dc1bd72 to
287635f
Compare
| @@ -134,24 +137,24 @@ impl<'a, T, N: Location<'a>> DeferTick for Singleton<T, Bounded, Tick<N>> { | |||
|
|
|||
| impl<'a, T, N: Location<'a>> CycleComplete<'a, TickCycle> for Singleton<T, Bounded, Tick<N>> { | |||
| fn complete(self, ident: syn::Ident) { | |||
| self.flow_state.borrow_mut().leaves.as_mut().expect("Attempted to add a leaf to a flow that has already been finalized. No leaves can be added after the flow has been compiled.").push(HfPlusLeaf::CycleSink { | |||
| self.flow_state().clone().borrow_mut().leaves.as_mut().expect("Attempted to add a leaf to a flow that has already been finalized. No leaves can be added after the flow has been compiled.").push(HfPlusLeaf::CycleSink { | |||
There was a problem hiding this comment.
Why the clone? Rc will just increment then immediately decrement?
There was a problem hiding this comment.
Borrow checker is unhappy if we don't clone because self is borrowed by .flow_state() but we need to move the IR node.
This was referenced Nov 5, 2024
MingweiSamuel
approved these changes
Nov 5, 2024
Comment on lines
+140
to
143
| self.flow_state().clone().borrow_mut().leaves.as_mut().expect("Attempted to add a leaf to a flow that has already been finalized. No leaves can be added after the flow has been compiled.").push(HfPlusLeaf::CycleSink { | ||
| ident, | ||
| location_kind: self.location_kind, | ||
| location_kind: self.location_kind(), | ||
| input: Box::new(self.ir_node.into_inner()), |
There was a problem hiding this comment.
Could avoid the clone via
input: Box::new(self.ir_node.replace(HfPlusNode::Placeholder)),(or implement Default for HfPlusNode -> Placeholder and use self.ir_node.take())
Doesn't really matter that much though
…s directly in streams
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.