From 8f7d3936f8a33e7ab01580fdfed8a7d0f41ae2a7 Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sun, 6 Sep 2026 15:12:46 +0000 Subject: [PATCH] Rename serve_edge to serve_input --- node-graph/graph-craft/src/document/value.rs | 6 +++--- .../src/dynamic_executor.rs | 8 ++++---- node-graph/libraries/core-types/src/node.rs | 4 ++-- .../libraries/core-types/src/record/input.rs | 4 ++-- .../libraries/core-types/src/record/mod.rs | 2 +- .../libraries/core-types/src/record/route.rs | 4 ++-- .../libraries/core-types/src/record/serve.rs | 2 +- .../libraries/core-types/src/record/testkit.rs | 4 ++-- .../libraries/core-types/src/registry.rs | 14 +++++++------- node-graph/node-macro/src/codegen.rs | 2 +- node-graph/nodes/gcore/src/memo.rs | 14 +++++++------- node-graph/nodes/gcore/src/record.rs | 18 +++++++++--------- node-graph/nodes/graphic/src/record.rs | 8 ++++---- node-graph/nodes/gstd/src/render_node.rs | 2 +- node-graph/nodes/math/src/lib.rs | 18 +++++++++--------- 15 files changed, 55 insertions(+), 55 deletions(-) diff --git a/node-graph/graph-craft/src/document/value.rs b/node-graph/graph-craft/src/document/value.rs index 58beb70fbe..9a2363f06b 100644 --- a/node-graph/graph-craft/src/document/value.rs +++ b/node-graph/graph-craft/src/document/value.rs @@ -366,20 +366,20 @@ macro_rules! tagged_value { // ======================= if ty == core_types::registry::record_edge_type::<()>() { let edge = handle.downcast_record::<()>().map_err(|e| format!("{e:?}"))?; - return Ok(core_types::record::serve_edge(&edge, ctx, frames).map(|_| TaggedValue::None)); + return Ok(core_types::record::serve_input(&edge, ctx, frames).map(|_| TaggedValue::None)); } $( if ty == core_types::registry::record_edge_type::<$ty>() { let layout = handle.layout().clone(); let edge = handle.downcast_record::<$ty>().map_err(|e| format!("{e:?}"))?; - return Ok(core_types::record::serve_edge(&edge, ctx, frames) + return Ok(core_types::record::serve_input(&edge, ctx, frames) .map(|value| TaggedValue::$identifier(unsafe { core_types::record::read_element::<$ty>(layout.rec(&value)) }))); } )* if ty == core_types::registry::record_edge_type::() { let layout = handle.layout().clone(); let edge = handle.downcast_record::().map_err(|e| format!("{e:?}"))?; - return Ok(core_types::record::serve_edge(&edge, ctx, frames) + return Ok(core_types::record::serve_input(&edge, ctx, frames) .map(|value| TaggedValue::RenderOutput(unsafe { core_types::record::read_element::(layout.rec(&value)) }))); } Err(format!("Cannot convert edge of type {ty} to TaggedValue")) diff --git a/node-graph/interpreted-executor/src/dynamic_executor.rs b/node-graph/interpreted-executor/src/dynamic_executor.rs index 63e8c580c4..9d4529afcc 100644 --- a/node-graph/interpreted-executor/src/dynamic_executor.rs +++ b/node-graph/interpreted-executor/src/dynamic_executor.rs @@ -219,7 +219,7 @@ impl DynamicExecutor { _ => None, } } else { - match core_types::record::serve_edge(&edge, &ctx, &frames) { + match core_types::record::serve_input(&edge, &ctx, &frames) { GPoll::Final(value) | GPoll::Partial(value) => { let rec = layout.rec(&value); // SAFETY: the serve produced one live record of the edge's layout. @@ -697,7 +697,7 @@ mod test { let scope = EvalScope::new(None, None, None, &generations, &arena); let ctx = ContextImpl::root(&scope); let frames = core_types::record::test_frames(layout.frame_bytes()); - let GPoll::Final(value) = core_types::record::serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&edge, &ctx, &frames) else { panic!("expected a final record"); }; assert_eq!(unsafe { core_types::record::read_element::(layout.rec(&value)) }, 2); @@ -742,7 +742,7 @@ mod test { let layout = handle.layout().clone(); let edge = handle.duplicate().downcast_record::().unwrap(); let frames = core_types::record::test_frames(executor.tree().stack_need()); - let GPoll::Final(value) = core_types::record::serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&edge, &ctx, &frames) else { panic!("the flipped clone must evaluate over record wires, got a non-final poll"); }; assert_eq!(unsafe { core_types::record::read_element::(layout.rec(&value)) }, 7.); @@ -769,7 +769,7 @@ mod test { let ctx = ContextImpl::root(&scope); let edge = executor.tree().get(NodeId(2)).unwrap().downcast_record::().unwrap(); let frames = core_types::record::test_frames(executor.tree().stack_need()); - let result = core_types::record::serve_edge(&edge, &ctx, &frames); + let result = core_types::record::serve_input(&edge, &ctx, &frames); // The empty raster level folds to an empty palette: past-end at lane 0. assert!( matches!(&result, GPoll::Error(error) if error.kind == core_types::gpoll::ErrorKind::PastEnd), diff --git a/node-graph/libraries/core-types/src/node.rs b/node-graph/libraries/core-types/src/node.rs index b9c564768e..e0b90fe3b3 100644 --- a/node-graph/libraries/core-types/src/node.rs +++ b/node-graph/libraries/core-types/src/node.rs @@ -631,7 +631,7 @@ mod tests { use crate::arena::Arena; use crate::context::ExtractArena; - use crate::record::{LiftedSource, serve_edge}; + use crate::record::{LiftedSource, serve_input}; #[derive(Clone, Copy)] struct TestInput<'a> { @@ -676,7 +676,7 @@ mod tests { let layout = Node::::layout(&node).clone(); let erased: Box> = Box::new(node); let frames = crate::record::test_frames(1 << 12); - let GPoll::Final(value) = serve_edge(&*erased, &input, &frames) else { + let GPoll::Final(value) = serve_input(&*erased, &input, &frames) else { panic!("the erased edge must serve a final record"); }; // SAFETY: the record was served at `layout`, whose element is the output. diff --git a/node-graph/libraries/core-types/src/record/input.rs b/node-graph/libraries/core-types/src/record/input.rs index 5559544052..4d028896af 100644 --- a/node-graph/libraries/core-types/src/record/input.rs +++ b/node-graph/libraries/core-types/src/record/input.rs @@ -3,7 +3,7 @@ use super::access::{Rec, RecordValue, read_element}; use super::frames::Frames; use super::layout::Layout; -use super::serve::{FrameClaim, Served, serve_edge}; +use super::serve::{FrameClaim, Served, serve_input}; use crate::gpoll::GPoll; use crate::node::Node; @@ -513,6 +513,6 @@ impl RecordExtract { // The element copies out by value, so the edge's claim dies with // the scope. let scope = frames.scope(); - serve_edge(&self.edge, input, &scope).map(|value| unsafe { read_element::(self.layout.rec(&value)) }) + serve_input(&self.edge, input, &scope).map(|value| unsafe { read_element::(self.layout.rec(&value)) }) } } diff --git a/node-graph/libraries/core-types/src/record/mod.rs b/node-graph/libraries/core-types/src/record/mod.rs index 5b31b7d2d4..2acf93f4d8 100644 --- a/node-graph/libraries/core-types/src/record/mod.rs +++ b/node-graph/libraries/core-types/src/record/mod.rs @@ -32,5 +32,5 @@ pub use owned::{OwnedRecord, deepen_field_value, register_deep_element_clone, re pub use promote::{Promotion, assert_promoted, register_element_promote, register_field_promote, register_retained_heap}; pub use route::{RecordSource, SourcePlan}; pub use run::{Group, GroupItem, RunBuilder, RunColumn, RunView}; -pub use serve::{FrameClaim, MaterializedSpan, Served, SlotRun, serve_edge}; +pub use serve::{FrameClaim, MaterializedSpan, Served, SlotRun, serve_input}; pub use testkit::{LiftedSource, ServedRecord, capture, test_frames}; diff --git a/node-graph/libraries/core-types/src/record/route.rs b/node-graph/libraries/core-types/src/record/route.rs index f079e2a22e..4f3de5b362 100644 --- a/node-graph/libraries/core-types/src/record/route.rs +++ b/node-graph/libraries/core-types/src/record/route.rs @@ -3,7 +3,7 @@ use super::access::{Rec, apply_plan}; use super::frames::Frames; use super::layout::{Layout, copy_plan}; -use super::serve::{FrameClaim, Served, serve_edge}; +use super::serve::{FrameClaim, Served, serve_input}; use crate::attribute; use crate::gpoll::GPoll; use crate::node::Node; @@ -97,7 +97,7 @@ where let Some(plan) = &self.plan else { return self.edge.serve(input, slot); }; - match serve_edge(&self.edge, input, &mut slot.frames().reborrow()) { + match serve_input(&self.edge, input, &mut slot.frames().reborrow()) { GPoll::Final(value) => { // SAFETY: the value came from this edge, so it carries the // plan's source layout. diff --git a/node-graph/libraries/core-types/src/record/serve.rs b/node-graph/libraries/core-types/src/record/serve.rs index 510edf5e99..1f0560642a 100644 --- a/node-graph/libraries/core-types/src/record/serve.rs +++ b/node-graph/libraries/core-types/src/record/serve.rs @@ -280,7 +280,7 @@ impl<'e> Served<'e> { /// Claims `node`'s own frame from `frames` and serves through it: the /// caller-side half of [`Node::serve`], for drivers that want the record /// rather than the proof. -pub fn serve_edge<'e, C, N>(node: &N, input: &C, frames: &Frames<'e>) -> GPoll> +pub fn serve_input<'e, C, N>(node: &N, input: &C, frames: &Frames<'e>) -> GPoll> where N: Node + ?Sized, C: crate::context::ExtractArena, diff --git a/node-graph/libraries/core-types/src/record/testkit.rs b/node-graph/libraries/core-types/src/record/testkit.rs index da364d06f1..4c23236dca 100644 --- a/node-graph/libraries/core-types/src/record/testkit.rs +++ b/node-graph/libraries/core-types/src/record/testkit.rs @@ -3,7 +3,7 @@ use super::frames::{FrameArena, Frames}; use super::layout::{Layout, element_write}; use super::owned::OwnedRecord; -use super::serve::{FrameClaim, Served, serve_edge}; +use super::serve::{FrameClaim, Served, serve_input}; use crate::gpoll::GPoll; use crate::node::Node; @@ -81,7 +81,7 @@ where { let scope = frames.scope(); let layout = node.layout().clone(); - serve_edge(node, ctx, &scope).map(|value| ServedRecord { + serve_input(node, ctx, &scope).map(|value| ServedRecord { // SAFETY: the poll served `value` at the node's declared layout and // nothing has claimed frames since. record: unsafe { OwnedRecord::copy_out(&layout, layout.rec(&value)) }, diff --git a/node-graph/libraries/core-types/src/registry.rs b/node-graph/libraries/core-types/src/registry.rs index 9027d91919..a914498b9b 100644 --- a/node-graph/libraries/core-types/src/registry.rs +++ b/node-graph/libraries/core-types/src/registry.rs @@ -326,7 +326,7 @@ mod tests { use std::sync::Arc; use std::sync::atomic::{AtomicU32, Ordering}; - use crate::record::{FrameClaim, Layout, LiftedSource, Served, element_write, read_element, serve_edge}; + use crate::record::{FrameClaim, Layout, LiftedSource, Served, element_write, read_element, serve_input}; fn counting() -> LiftedSource Fn(&ContextImpl<'c>) -> GPoll> { let count = AtomicU32::new(0); @@ -383,7 +383,7 @@ mod tests { assert_eq!(*handle.ty(), concrete!(String)); let wired = handle.downcast_erased::(concrete!(String)).unwrap(); - let GPoll::Final(value) = serve_edge(&wired, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&wired, &ctx, &frames) else { panic!("borrow-carrying output must serve through the erased edge"); }; // SAFETY: the record was served at `layout`, whose element is the borrow. @@ -466,7 +466,7 @@ mod tests { let erased: Box = Box::new(nested); let frames = crate::record::test_frames(1 << 12); - let GPoll::Final(value) = serve_edge(&*erased, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&*erased, &ctx, &frames) else { panic!("nested repeat must evaluate"); }; // SAFETY: the record was served at `layout`, whose element is the output. @@ -545,7 +545,7 @@ mod tests { let graph = ShiftFootprintNode::new(shifted, shifted_layout); let layout = Node::::layout(&graph).clone(); - let GPoll::Final(value) = serve_edge(&graph, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&graph, &ctx, &frames) else { panic!("the footprint shift must reach the content"); }; // SAFETY: the record was served at `layout`, whose element is the resolution. @@ -599,10 +599,10 @@ mod tests { let second = duplicate.downcast_record::().unwrap(); // SAFETY: each record was served at `layout`, whose element is the count. let count = |value| unsafe { layout.rec(&value).element::() }; - assert_eq!(serve_edge(&first, &ctx, &frames).map(count), GPoll::Final(1)); - assert_eq!(serve_edge(&second, &ctx, &frames).map(count), GPoll::Final(2)); + assert_eq!(serve_input(&first, &ctx, &frames).map(count), GPoll::Final(1)); + assert_eq!(serve_input(&second, &ctx, &frames).map(count), GPoll::Final(2)); drop(first); - assert_eq!(serve_edge(&second, &ctx, &frames).map(count), GPoll::Final(3)); + assert_eq!(serve_input(&second, &ctx, &frames).map(count), GPoll::Final(3)); } } diff --git a/node-graph/node-macro/src/codegen.rs b/node-graph/node-macro/src/codegen.rs index 4901cee905..9060aae99f 100644 --- a/node-graph/node-macro/src/codegen.rs +++ b/node-graph/node-macro/src/codegen.rs @@ -1606,7 +1606,7 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn // The element copies out by value, so the edge's // claim dies with the query. let __scope = __frames.scope(); - #core_types::record::serve_edge(&self.#name, __input, &__scope) + #core_types::record::serve_input(&self.#name, __input, &__scope) .map(|__value| unsafe { #core_types::record::read_element::<#ty>(#layout.rec(&__value)) }) }; let #arg = #core_types::extent::ValueIn::new(&#query); diff --git a/node-graph/nodes/gcore/src/memo.rs b/node-graph/nodes/gcore/src/memo.rs index 3ce26695cc..44279a6126 100644 --- a/node-graph/nodes/gcore/src/memo.rs +++ b/node-graph/nodes/gcore/src/memo.rs @@ -307,7 +307,7 @@ mod tests { assert!(handle.serialize().is_none(), "no snapshot before the first eval"); let edge = handle.duplicate().downcast_record::().unwrap(); - let GPoll::Final(_) = core_types::record::serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(_) = core_types::record::serve_input(&edge, &ctx, &frames) else { panic!("expected a final record"); }; @@ -334,7 +334,7 @@ mod tests { let handle = EdgeHandle::new_record::(Arc::new(monitor) as Arc); let edge = handle.duplicate().downcast_record::().unwrap(); - let GPoll::Final(_) = core_types::record::serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(_) = core_types::record::serve_input(&edge, &ctx, &frames) else { panic!("expected a final record"); }; @@ -496,7 +496,7 @@ mod tests { let served_at = |arena: &Arena| { let scope = scope_fixture(&generations, arena).with_persistent(&persistent); let ctx = ContextImpl::root(&scope); - let GPoll::Final(value) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("the memo must serve a final record"); }; let element: &String = unsafe { core_types::record::borrow_element(layout.rec(&value)) }; @@ -627,7 +627,7 @@ mod tests { let at = |lane: u64| { let mut ctx = ContextImpl::root(&scope); core_types::context::InjectIndex::set_index(&mut ctx, lane); - core_types::record::serve_edge(&memo, &ctx, &frames) + core_types::record::serve_input(&memo, &ctx, &frames) }; let GPoll::Final(value) = at(1) else { @@ -655,10 +655,10 @@ mod tests { let layout = element_layout::(); let memo = FrameMemoNode::new(lifted::("lent out".to_string()), &layout); - let GPoll::Final(first) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Final(first) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("the miss must publish the record"); }; - let GPoll::Final(second) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Final(second) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("the hit must revive the published record"); }; let first: &String = unsafe { core_types::record::borrow_element(layout.rec(&first)) }; @@ -679,7 +679,7 @@ mod tests { let served_at = |arena: &Arena| { let scope = scope_fixture(&generations, arena).with_persistent(&persistent); let ctx = ContextImpl::root(&scope); - let GPoll::Final(value) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("the span memo must serve a final record"); }; let element: &String = unsafe { core_types::record::borrow_element(layout.rec(&value)) }; diff --git a/node-graph/nodes/gcore/src/record.rs b/node-graph/nodes/gcore/src/record.rs index 35b70c330f..fc9a4d0087 100644 --- a/node-graph/nodes/gcore/src/record.rs +++ b/node-graph/nodes/gcore/src/record.rs @@ -1742,7 +1742,7 @@ mod tests { let head = ctx.index_head(); for (lane, element) in [(0u64, 10.), (1, 11.)] { let lane_frames = frames.scope(); - let GPoll::Final(value) = core_types::record::serve_edge(&node, &ctx.promoted(&head, lane), &lane_frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&node, &ctx.promoted(&head, lane), &lane_frames) else { panic!("expected a final record at lane {lane}"); }; let rec = out.rec(&value); @@ -2180,7 +2180,7 @@ mod tests { checked_multiply_opacity_layout_meta(), &[Some(&source_layout)], ); - let GPoll::Error(error) = core_types::record::serve_edge(&failing, &ctx, &frames) else { + let GPoll::Error(error) = core_types::record::serve_input(&failing, &ctx, &frames) else { panic!("expected an error"); }; assert!(error.kind == "negative factor"); @@ -2481,7 +2481,7 @@ mod tests { for pass in ["the spawning eval", "the slot hit"] { let scoped = frames.scope(); - let GPoll::Final(value) = core_types::record::serve_edge(&node, &ctx, &scoped) else { + let GPoll::Final(value) = core_types::record::serve_input(&node, &ctx, &scoped) else { panic!("an inline completion is final on {pass}"); }; let rec = layout.rec(&value); @@ -2521,7 +2521,7 @@ mod tests { ), &f64_layout(&[]), ); - let GPoll::Final(value) = core_types::record::serve_edge(&node, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&node, &ctx, &frames) else { panic!("expected a final record"); }; let element = unsafe { Node::::layout(&node).rec(&value).element::() }; @@ -2621,7 +2621,7 @@ mod tests { label_layout_meta(), &[Some(&labeled)], ); - let GPoll::Final(value) = core_types::record::serve_edge(&chain, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&chain, &ctx, &frames) else { panic!("expected a final record"); }; let rec = relabeled.rec(&value); @@ -2867,7 +2867,7 @@ mod tests { let chain = ForwardRecordNode::new(RecordSource::new(f64_record_source(&layout, 4., vec![("opacity", 0.25)]), &layout, &layout.clone()), &layout); - let GPoll::Final(value) = core_types::record::serve_edge(&chain, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&chain, &ctx, &frames) else { panic!("expected a final record"); }; let rec = layout.rec(&value); @@ -2955,7 +2955,7 @@ mod tests { }; let memo = crate::memo::MemoizeNode::new(source, &layout); - let GPoll::Partial(_) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Partial(_) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("expected a partial record"); }; let GPoll::Partial(served) = core_types::record::capture(&memo, &ctx, &frames) else { @@ -2985,7 +2985,7 @@ mod tests { let scope = scope_fixture(&generations, &first_arena).with_persistent(&persistent); let ctx = ContextImpl::root(&scope); let mut first = frames.reborrow(); - let GPoll::Final(_) = core_types::record::serve_edge(&memo, &ctx, &mut first) else { + let GPoll::Final(_) = core_types::record::serve_input(&memo, &ctx, &mut first) else { panic!("expected a final record"); }; } @@ -2995,7 +2995,7 @@ mod tests { let later_arena = Arena::new(1024).unwrap(); let scope = scope_fixture(&generations, &later_arena).with_persistent(&persistent); let ctx = ContextImpl::root(&scope); - let GPoll::Final(value) = core_types::record::serve_edge(&memo, &ctx, &frames) else { + let GPoll::Final(value) = core_types::record::serve_input(&memo, &ctx, &frames) else { panic!("expected a final record"); }; let rec = labeled.rec(&value); diff --git a/node-graph/nodes/graphic/src/record.rs b/node-graph/nodes/graphic/src/record.rs index 8894326ecd..2afc45c093 100644 --- a/node-graph/nodes/graphic/src/record.rs +++ b/node-graph/nodes/graphic/src/record.rs @@ -708,7 +708,7 @@ mod tests { assert_eq!(node.extent_at(&ctx, 0, &frames.reborrow()), GPoll::Final(Extent::Exactly(1)), "the group is the level's single lane"); let head = ctx.index_head(); - let GPoll::Final(value) = record::serve_edge(&node, &ctx.promoted(&head, 0), &frames) else { + let GPoll::Final(value) = record::serve_input(&node, &ctx.promoted(&head, 0), &frames) else { panic!("expected a final record"); }; let Graphic::Group(group) = (unsafe { record::borrow_element::(out.rec(&value)) }) else { @@ -744,7 +744,7 @@ mod tests { let out = Node::::layout(&node).clone(); let head = ctx.index_head(); - let GPoll::Final(value) = record::serve_edge(&node, &ctx.promoted(&head, 0), &frames) else { + let GPoll::Final(value) = record::serve_input(&node, &ctx.promoted(&head, 0), &frames) else { panic!("expected a final record"); }; let copy = unsafe { (out.element.clone_out)(out.rec(&value).ptr()) }; @@ -846,7 +846,7 @@ mod tests { ); let out = Node::::layout(&node).clone(); let head = ctx.index_head(); - let GPoll::Final(value) = record::serve_edge(&node, &ctx.promoted(&head, 0), &frames) else { + let GPoll::Final(value) = record::serve_input(&node, &ctx.promoted(&head, 0), &frames) else { panic!("expected a final record"); }; let Graphic::Group(group) = (unsafe { record::borrow_element::(out.rec(&value)) }) else { @@ -882,7 +882,7 @@ mod tests { // SAFETY: the element is cloned out inside the scope, so no borrow // into the frame escapes it. let scope = frames.scope(); - let GPoll::Final(value) = record::serve_edge(&wrapped, &ctx.promoted(&head, 0), &scope) else { + let GPoll::Final(value) = record::serve_input(&wrapped, &ctx.promoted(&head, 0), &scope) else { panic!("expected a final record"); }; let group = unsafe { record::borrow_element::(wrap_out.rec(&value)) }.clone(); diff --git a/node-graph/nodes/gstd/src/render_node.rs b/node-graph/nodes/gstd/src/render_node.rs index db67ea0f35..05f5a79dda 100644 --- a/node-graph/nodes/gstd/src/render_node.rs +++ b/node-graph/nodes/gstd/src/render_node.rs @@ -274,7 +274,7 @@ mod tests { lane_invariant: u32::MAX, }, ); - let GPoll::Final(result) = core_types::record::serve_edge(&graph, &ctx, &frames) else { + let GPoll::Final(result) = core_types::record::serve_input(&graph, &ctx, &frames) else { panic!("create_context must complete synchronously"); }; let output: &RenderOutput = unsafe { core_types::record::borrow_element(layout.rec(&result)) }; diff --git a/node-graph/nodes/math/src/lib.rs b/node-graph/nodes/math/src/lib.rs index dc3c807d77..4b9b787e74 100644 --- a/node-graph/nodes/math/src/lib.rs +++ b/node-graph/nodes/math/src/lib.rs @@ -1014,7 +1014,7 @@ mod graphene_test { use core_types::context::{ContextImpl, EvalScope}; use core_types::gpoll::{Finality, GPoll}; use core_types::node::{BatchStatus, Node}; - use core_types::record::{Layout, LiftedSource, RecordValue, serve_edge}; + use core_types::record::{Layout, LiftedSource, RecordValue, serve_input}; use core_types::registry::{ErasedRecordNode, construct}; use core_types::value::record_value_edge; use std::mem::MaybeUninit; @@ -1073,7 +1073,7 @@ mod graphene_test { let graph = installed(AddNode::<_, _, f64, f64>::new(a, b, &la, &lb), &out); let frames = frames_for(&[&la, &lb, &out]); - let GPoll::Final(value) = serve_edge(&graph, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&graph, &ctx, &frames) else { panic!("expected a final record"); }; assert_eq!(element::(&out, &value), 3.0); @@ -1122,7 +1122,7 @@ mod graphene_test { let edge = wired.downcast_record::().unwrap(); let frames = frames_for(&[&layout]); - let GPoll::Final(value) = serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&edge, &ctx, &frames) else { panic!("expected a final record"); }; assert!(element::(&layout, &value)); @@ -1168,7 +1168,7 @@ mod graphene_test { let edge = wired.downcast_record::().unwrap(); let frames = frames_for(&[&layout]); - let GPoll::Final(value) = serve_edge(&edge, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&edge, &ctx, &frames) else { panic!("expected a final record"); }; assert_eq!(element::(&layout, &value), 4.0); @@ -1215,7 +1215,7 @@ mod graphene_test { let out = Node::::layout(&graph).clone(); let frames = frames_for(&[&lc, <, &lf, &out]); - let GPoll::Final(value) = serve_edge(&graph, &ctx, &frames) else { + let GPoll::Final(value) = serve_input(&graph, &ctx, &frames) else { panic!("expected a final record"); }; assert_eq!(element::(&out, &value), 1.0); @@ -1241,8 +1241,8 @@ mod graphene_test { let out = Node::::layout(&partial).clone(); let frames = frames_for(&[&lc1, &lp1, &lpa1, &lc2, &lp2, &lpa2, &out]); - assert!(matches!(serve_edge(&pending, &ctx, &frames), GPoll::Pending)); - let GPoll::Partial(value) = serve_edge(&partial, &ctx, &frames) else { + assert!(matches!(serve_input(&pending, &ctx, &frames), GPoll::Pending)); + let GPoll::Partial(value) = serve_input(&partial, &ctx, &frames) else { panic!("expected a partial record"); }; assert_eq!(element::(&out, &value), 7.0); @@ -1262,7 +1262,7 @@ mod graphene_test { let out = Node::::layout(&graph).clone(); let frames = frames_for(&[&lc, <, &lf, &out]); - let GPoll::Partial(value) = serve_edge(&graph, &ctx, &frames) else { + let GPoll::Partial(value) = serve_input(&graph, &ctx, &frames) else { panic!("expected a partial record"); }; assert_eq!(element::(&out, &value), 1.0); @@ -1280,7 +1280,7 @@ mod graphene_test { let graph = installed(AddNode::<_, _, f64, f64>::new(fallback, src, &lfb, &ls), &out); let frames = frames_for(&[&lfb, &ls, &out]); - let GPoll::Fallback(boxed) = serve_edge(&graph, &ctx, &frames) else { + let GPoll::Fallback(boxed) = serve_input(&graph, &ctx, &frames) else { panic!("fallback must propagate with the computed stand-in"); }; assert_eq!(element::(&out, &boxed.0), 5.0);