mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-15 22:28:10 +08:00
Rename serve_edge to serve_input
This commit is contained in:
@@ -307,7 +307,7 @@ mod tests {
|
||||
assert!(handle.serialize().is_none(), "no snapshot before the first eval");
|
||||
|
||||
let edge = handle.duplicate().downcast_record::<u32>().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::<u32>(Arc::new(monitor) as Arc<ErasedRecordNode>);
|
||||
|
||||
let edge = handle.duplicate().downcast_record::<u32>().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::<String>();
|
||||
let memo = FrameMemoNode::new(lifted::<String>("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)) };
|
||||
|
||||
@@ -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::<ContextImpl>::layout(&node).rec(&value).element::<f64>() };
|
||||
@@ -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);
|
||||
|
||||
@@ -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::<Graphic>(out.rec(&value)) }) else {
|
||||
@@ -744,7 +744,7 @@ mod tests {
|
||||
let out = Node::<ContextImpl>::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::<ContextImpl>::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::<Graphic>(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::<Graphic>(wrap_out.rec(&value)) }.clone();
|
||||
|
||||
@@ -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)) };
|
||||
|
||||
@@ -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::<f64>(&out, &value), 3.0);
|
||||
@@ -1122,7 +1122,7 @@ mod graphene_test {
|
||||
let edge = wired.downcast_record::<bool>().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::<bool>(&layout, &value));
|
||||
@@ -1168,7 +1168,7 @@ mod graphene_test {
|
||||
let edge = wired.downcast_record::<f64>().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::<f64>(&layout, &value), 4.0);
|
||||
@@ -1215,7 +1215,7 @@ mod graphene_test {
|
||||
let out = Node::<ContextImpl>::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::<f64>(&out, &value), 1.0);
|
||||
@@ -1241,8 +1241,8 @@ mod graphene_test {
|
||||
let out = Node::<ContextImpl>::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::<f64>(&out, &value), 7.0);
|
||||
@@ -1262,7 +1262,7 @@ mod graphene_test {
|
||||
let out = Node::<ContextImpl>::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::<f64>(&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::<f64>(&out, &boxed.0), 5.0);
|
||||
|
||||
Reference in New Issue
Block a user