employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

tamer: asg::graph::pre_add_edge: Use pre-narrowed source ObjectIndex 

Since we're statically invoking a particular ObjectKind's method, we already
know the source type.  Let's pre-narrow it for their (my) convenience.

DEV-13163
main
Mike Gerwitz 2023-07-25 10:55:08 -04:00
parent 28b83ad6a3
commit 2ecc143e02
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tamer/src/asg/graph.rs
View File

@ -430,12 +430,13 @@ pub trait AsgObjectMut: ObjectKind {
/// and the commit cannot fail. /// and the commit cannot fail.
/// If [`Err`] is provided to `commit`, /// If [`Err`] is provided to `commit`,
/// then [`Asg::add_edge`] will fail with that error. /// then [`Asg::add_edge`] will fail with that error.
fn pre_add_edge< ///
OA: ObjectIndexRelTo<OB>, /// Unlike the type of [`Asg::add_edge`],
OB: ObjectKind + ObjectRelatable, /// the source [`ObjectIndex`] has been narrowed to the appropriate
>( /// type for you.
fn pre_add_edge<OB: ObjectKind + ObjectRelatable>(
asg: &mut Asg, asg: &mut Asg,
_from_oi: &OA, _from_oi: ObjectIndex<Self>,
_to_oi: ObjectIndex<OB>, _to_oi: ObjectIndex<OB>,
_ctx_span: Option<Span>, _ctx_span: Option<Span>,
commit: impl FnOnce(&mut Asg), commit: impl FnOnce(&mut Asg),

16
tamer/src/asg/graph/object/rel.rs
View File

@ -938,7 +938,13 @@ where
ctx_span: Option<Span>, ctx_span: Option<Span>,
commit: impl FnOnce(&mut Asg), commit: impl FnOnce(&mut Asg),
) -> Result<(), AsgError> { ) -> Result<(), AsgError> {
O::pre_add_edge(asg, self, to_oi, ctx_span, commit) O::pre_add_edge(
asg,
self.widen().must_narrow_into::<O>(),
to_oi,
ctx_span,
commit,
)
} }
} }
@ -962,7 +968,13 @@ impl<OB: ObjectRelatable> ObjectIndexRelTo<OB> for ObjectIndexTo<OB> {
) -> Result<(), AsgError> { ) -> Result<(), AsgError> {
macro_rules! pre_add_edge { macro_rules! pre_add_edge {
($ty:ident) => { ($ty:ident) => {
$ty::pre_add_edge(asg, self, to_oi, ctx_span, commit) $ty::pre_add_edge(
asg,
self.widen().must_narrow_into::<$ty>(),
to_oi,
ctx_span,
commit,
)
}; };
} }