shadowfacts/v6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change modify to take ownership of the graph

Browse Source 
If the modify fails, the graph is left in a bad state, so the client
shouldn't be able to continue using it
This commit is contained in:
Shadowfacts 2024-11-01 11:43:35 -04:00
parent 1d1673e5ee
commit c18c1ced59
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/graph/src/lib.rs
View File

@ -58,7 +58,7 @@ impl<O: 'static, S: Synchronicity> Graph<O, S> {
self.node_graph.borrow().node_count() self.node_graph.borrow().node_count()
} }
pub fn modify<F>(&mut self, mut f: F) -> Result<(), BuildGraphError> pub fn modify<F>(mut self, mut f: F) -> Result<Self, BuildGraphError>
where where
F: FnMut(&mut GraphBuilder<O, S>) -> (), F: FnMut(&mut GraphBuilder<O, S>) -> (),
{ {
@ -81,14 +81,13 @@ impl<O: 'static, S: Synchronicity> Graph<O, S> {
let old_output = self.output.node_idx; let old_output = self.output.node_idx;
let mut graph = GraphBuilder { let mut graph = GraphBuilder {
// TODO: is using the same graph as self correct? if the modify fails, is it left in a bad state?
node_graph: Rc::clone(&self.node_graph), node_graph: Rc::clone(&self.node_graph),
output: Some(self.output.clone()), output: Some(self.output.clone()),
output_type: std::marker::PhantomData, output_type: std::marker::PhantomData,
is_valid: Rc::clone(&self.is_valid), is_valid: Rc::clone(&self.is_valid),
}; };
f(&mut graph); f(&mut graph);
*self = graph.build()?; self = graph.build()?;
// Any new inboud edges invalidate their target nodes. // Any new inboud edges invalidate their target nodes.
let mut graph = self.node_graph.borrow_mut(); let mut graph = self.node_graph.borrow_mut();
@ -113,7 +112,8 @@ impl<O: 'static, S: Synchronicity> Graph<O, S> {
} }
} }
Ok(()) drop(graph);
Ok(self)
} }
} }
@ -427,7 +427,7 @@ mod tests {
builder.set_output(ConstantRule(1)); builder.set_output(ConstantRule(1));
let mut graph = builder.build().unwrap(); let mut graph = builder.build().unwrap();
assert_eq!(*graph.evaluate(), 1); assert_eq!(*graph.evaluate(), 1);
graph graph = graph
.modify(|g| { .modify(|g| {
g.set_output(ConstantRule(2)); g.set_output(ConstantRule(2));
}) })
@ -444,7 +444,7 @@ mod tests {
*input.borrow_mut() = Some(builder.add_value(1)); *input.borrow_mut() = Some(builder.add_value(1));
let mut graph = builder.build().unwrap(); let mut graph = builder.build().unwrap();
assert_eq!(*graph.evaluate(), 1); assert_eq!(*graph.evaluate(), 1);
graph graph = graph
.modify(|g| { .modify(|g| {
*input.borrow_mut() = Some(g.add_value(2)); *input.borrow_mut() = Some(g.add_value(2));
}) })