diff --git a/src/bow.rs b/src/bow.rs index decb6ee..815cc17 100644 --- a/src/bow.rs +++ b/src/bow.rs @@ -3,7 +3,7 @@ use petgraph::stable_graph::StableDiGraph; use crate::graph::{BendIndex, DotIndex, Label, SegIndex, TaggedIndex, TaggedWeight, Walk}; use crate::primitive::{Bend, Dot, Seg}; -pub struct Bow<'a> { +pub struct Bow { seg1_dot1: DotIndex, seg1: SegIndex, seg1_dot2: DotIndex, @@ -11,11 +11,10 @@ pub struct Bow<'a> { seg2_dot1: DotIndex, seg2: SegIndex, seg2_dot2: DotIndex, - graph: &'a StableDiGraph, } -impl<'a> Bow<'a> { - pub fn new(index: BendIndex, graph: &'a StableDiGraph) -> Self { +impl Bow { + pub fn new(index: BendIndex, graph: &StableDiGraph) -> Self { let bend = index; let seg1_dot2 = Bend::new(bend, graph).prev().unwrap(); @@ -42,12 +41,11 @@ impl<'a> Bow<'a> { seg2_dot1, seg2, seg2_dot2, - graph, } } } -impl<'a> Walk for Bow<'a> { +impl Walk for Bow { fn interior(&self) -> Vec { vec![ TaggedIndex::Seg(self.seg1), diff --git a/src/router.rs b/src/router.rs index 8cf4c0f..2bb6e13 100644 --- a/src/router.rs +++ b/src/router.rs @@ -5,7 +5,7 @@ use std::cell::{Ref, RefCell}; use std::rc::Rc; use crate::astar::astar; -use crate::graph::{BendIndex, DotIndex, Path, SegIndex, TaggedIndex}; +use crate::graph::{BendIndex, DotIndex, SegIndex, TaggedIndex, Walk}; use crate::graph::{BendWeight, DotWeight, SegWeight, TaggedWeight}; use crate::guide::Guide; use crate::layout::Layout;