Merge the breadcrumb tree trait and struct into just a struct.

src/renderer/breadcrumb_tree.rs

@@ -1,33 +1,32 @@
 use crate::renderer::context_element::IntoContextElement;
 use std::borrow::Borrow;
 
-pub trait BreadcrumbTree {
-    fn get_ice(&self) -> &dyn IntoContextElement;
-
-    fn get_parent(&self) -> Option<&dyn BreadcrumbTree>;
+pub struct BreadcrumbTree<'a> {
+    parent: Option<&'a BreadcrumbTree<'a>>,
+    element: BreadcrumbTreeElement<'a>,
 }
 
-pub struct BreadcrumbTreeNode<'a> {
-    parent: Option<&'a dyn BreadcrumbTree>,
-    element: BreadcrumbTreeNodeElement<'a>,
-}
-
-pub enum BreadcrumbTreeNodeElement<'a> {
+pub enum BreadcrumbTreeElement<'a> {
     Owned(Box<dyn IntoContextElement>),
     Borrowed(&'a dyn IntoContextElement),
 }
 
-impl<'a> BreadcrumbTreeNode<'a> {
-    pub fn new(
-        parent: Option<&'a dyn BreadcrumbTree>,
-        element: BreadcrumbTreeNodeElement<'a>,
-    ) -> Self {
-        BreadcrumbTreeNode {
+impl<'a> BreadcrumbTree<'a> {
+    pub fn new(parent: Option<&'a BreadcrumbTree>, element: BreadcrumbTreeElement<'a>) -> Self {
+        BreadcrumbTree {
             parent: parent,
             element: element,
         }
     }
 
+    pub fn get_ice(&self) -> &dyn IntoContextElement {
+        self.element.borrow()
+    }
+
+    pub fn get_parent(&self) -> Option<&BreadcrumbTree> {
+        self.parent
+    }
+
     pub fn ice_iter(&'a self) -> impl Iterator<Item = &dyn IntoContextElement> {
         self.breadcrumb_iter().map(|b| b.get_ice())
     }
@@ -37,27 +36,17 @@ impl<'a> BreadcrumbTreeNode<'a> {
     }
 }
 
-impl<'a> Borrow<dyn IntoContextElement + 'a> for BreadcrumbTreeNodeElement<'a> {
+impl<'a> Borrow<dyn IntoContextElement + 'a> for BreadcrumbTreeElement<'a> {
     fn borrow(&self) -> &(dyn IntoContextElement + 'a) {
         match self {
-            BreadcrumbTreeNodeElement::Owned(ice) => ice.as_ref(),
-            BreadcrumbTreeNodeElement::Borrowed(ice) => *ice,
+            BreadcrumbTreeElement::Owned(ice) => ice.as_ref(),
+            BreadcrumbTreeElement::Borrowed(ice) => *ice,
         }
     }
 }
 
-impl<'a> BreadcrumbTree for BreadcrumbTreeNode<'a> {
-    fn get_ice(&self) -> &dyn IntoContextElement {
-        self.element.borrow()
-    }
-
-    fn get_parent(&self) -> Option<&dyn BreadcrumbTree> {
-        self.parent
-    }
-}
-
-impl<'a> IntoIterator for &'a BreadcrumbTreeNode<'a> {
-    type Item = &'a dyn BreadcrumbTree;
+impl<'a> IntoIterator for &'a BreadcrumbTree<'a> {
+    type Item = &'a BreadcrumbTree<'a>;
     type IntoIter = BreadcrumbTreeIterator<'a>;
 
     fn into_iter(self) -> BreadcrumbTreeIterator<'a> {
@@ -65,10 +54,10 @@ impl<'a> IntoIterator for &'a BreadcrumbTreeNode<'a> {
     }
 }
 
-pub struct BreadcrumbTreeIterator<'a>(Option<&'a dyn BreadcrumbTree>);
+pub struct BreadcrumbTreeIterator<'a>(Option<&'a BreadcrumbTree<'a>>);
 
 impl<'a> Iterator for BreadcrumbTreeIterator<'a> {
-    type Item = &'a dyn BreadcrumbTree;
+    type Item = &'a BreadcrumbTree<'a>;
 
     fn next(&mut self) -> Option<Self::Item> {
         let ret = self.0;