From 5b65e2e0b5d30c3798f448abbab4a6775b4b6c5a Mon Sep 17 00:00:00 2001
From: qwertz19281 <dellen903@gmail.com>
Date: Tue, 25 May 2021 16:06:27 +0200
Subject: [PATCH] refactor: Rename WidgetArray to WidgetSlice

---
 src/lib.rs                        |  2 +-
 src/widget/mod.rs                 |  2 +-
 src/widget/{array.rs => slice.rs} | 34 +++++++++++++++----------------
 src/widgets/pane/widget.rs        |  6 +++---
 4 files changed, 22 insertions(+), 22 deletions(-)
 rename src/widget/{array.rs => slice.rs} (93%)

diff --git a/src/lib.rs b/src/lib.rs
index 248cf3f6..65885de3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -57,7 +57,7 @@ pub(crate) use util::error::*;
 pub(crate) use util::tabulate::*;
 pub(crate) use util::traitcast::*;
 pub(crate) use util::*;
-pub(crate) use widget::array::*;
+pub(crate) use widget::slice::*;
 pub(crate) use widget::as_widget::*;
 pub(crate) use widget::cast::*;
 pub(crate) use widget::link::*;
diff --git a/src/widget/mod.rs b/src/widget/mod.rs
index a79eb455..b8f39f67 100644
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -19,7 +19,7 @@ pub mod imp;
 pub mod resolved;
 pub mod resolvable;
 pub mod root;
-pub mod array;
+pub mod slice;
 pub mod ident;
 
 /// Core Trait of guion ™️
diff --git a/src/widget/array.rs b/src/widget/slice.rs
similarity index 93%
rename from src/widget/array.rs
rename to src/widget/slice.rs
index 9d2c4636..c450b904 100644
--- a/src/widget/array.rs
+++ b/src/widget/slice.rs
@@ -1,21 +1,21 @@
 //! Trait over types holding an array of AsWidget types
 use super::*;
 
-pub trait WidgetArray<E>: Sized where E: Env {
+pub trait WidgetSlice<E>: Sized where E: Env {
     fn len(&self) -> usize;
     fn child<'s>(&'s self, i: usize) -> Result<Resolvable<'s,E>,()>;
     fn into_child<'w>(self, i: usize) -> Result<Resolvable<'w,E>,()> where Self: 'w;
     fn childs<'s>(&'s self) -> Vec<Resolvable<'s,E>>;
     fn into_childs<'w>(self) -> Vec<Resolvable<'w,E>> where Self: 'w;
 }
-pub trait WidgetArrayMut<E>: WidgetArray<E> where E: Env {
+pub trait WidgetSliceMut<E>: WidgetSlice<E> where E: Env {
     fn child_mut<'s>(&'s mut self, i: usize) -> Result<ResolvableMut<'s,E>,()>;
     fn into_child_mut<'w>(self, i: usize) -> Result<ResolvableMut<'w,E>,()> where Self: 'w;
     fn childs_mut<'s>(&'s mut self) -> Vec<ResolvableMut<'s,E>>;
     fn into_childs_mut<'w>(self) -> Vec<ResolvableMut<'w,E>> where Self: 'w;
 }
 
-impl<T,E> WidgetArray<E> for Vec<T> where T: AsWidget<E>, E: Env {
+impl<T,E> WidgetSlice<E> for Vec<T> where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         self.len()
@@ -47,7 +47,7 @@ impl<T,E> WidgetArray<E> for Vec<T> where T: AsWidget<E>, E: Env {
             .collect::<Vec<_>>()
     }
 }
-impl<T,E> WidgetArrayMut<E> for Vec<T> where T: AsWidgetMut<E>, E: Env {
+impl<T,E> WidgetSliceMut<E> for Vec<T> where T: AsWidgetMut<E>, E: Env {
     #[inline]
     fn child_mut(&mut self, i: usize) -> Result<ResolvableMut<E>,()> {
         self.get_mut(i)
@@ -76,7 +76,7 @@ impl<T,E> WidgetArrayMut<E> for Vec<T> where T: AsWidgetMut<E>, E: Env {
     }
 }
 
-impl<T,E> WidgetArray<E> for &[T] where T: AsWidget<E>, E: Env {
+impl<T,E> WidgetSlice<E> for &[T] where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         (**self).len()
@@ -107,7 +107,7 @@ impl<T,E> WidgetArray<E> for &[T] where T: AsWidget<E>, E: Env {
     }
 }
 
-impl<T,E> WidgetArray<E> for &mut [T] where T: AsWidget<E>, E: Env {
+impl<T,E> WidgetSlice<E> for &mut [T] where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         (**self).len()
@@ -137,7 +137,7 @@ impl<T,E> WidgetArray<E> for &mut [T] where T: AsWidget<E>, E: Env {
             .collect::<Vec<_>>()
     }
 }
-impl<T,E> WidgetArrayMut<E> for &mut [T] where T: AsWidgetMut<E>, E: Env {
+impl<T,E> WidgetSliceMut<E> for &mut [T] where T: AsWidgetMut<E>, E: Env {
     #[inline]
     fn child_mut(&mut self, i: usize) -> Result<ResolvableMut<E>,()> {
         self.get_mut(i)
@@ -176,7 +176,7 @@ macro_rules! impl_wpps_tuple {
     } => {
         impl_wpps_tuple!(($n-1);$senf;$($tt)+;$($ll)+;$($mm => $xx),+);
 
-        impl<E,$t,$($tt),+> WidgetArray<E> for ($t,$($tt),+) where
+        impl<E,$t,$($tt),+> WidgetSlice<E> for ($t,$($tt),+) where
             E: Env,
             $t: AsWidget<E>,
             $($tt: AsWidget<E>),+ 
@@ -214,7 +214,7 @@ macro_rules! impl_wpps_tuple {
                 vec![$l.into_ref(), $( $ll .into_ref() ),* ]
             }
         }
-        impl<E,$t,$($tt),+> WidgetArrayMut<E> for ($t,$($tt),+) where
+        impl<E,$t,$($tt),+> WidgetSliceMut<E> for ($t,$($tt),+) where
             E: Env,
             $t: AsWidgetMut<E>,
             $($tt: AsWidgetMut<E>),+ 
@@ -249,7 +249,7 @@ macro_rules! impl_wpps_tuple {
             }
         }
 
-        impl<E,$t,$($tt),+> WidgetArray<E> for &($t,$($tt),+) where
+        impl<E,$t,$($tt),+> WidgetSlice<E> for &($t,$($tt),+) where
             E: Env,
             $t: AsWidget<E>,
             $($tt: AsWidget<E>),+ 
@@ -288,7 +288,7 @@ macro_rules! impl_wpps_tuple {
             }
         }
 
-        impl<E,$t,$($tt),+> WidgetArray<E> for &mut ($t,$($tt),+) where
+        impl<E,$t,$($tt),+> WidgetSlice<E> for &mut ($t,$($tt),+) where
             E: Env,
             $t: AsWidget<E>,
             $($tt: AsWidget<E>),+ 
@@ -326,7 +326,7 @@ macro_rules! impl_wpps_tuple {
                 vec![$l.as_ref(), $( $ll .as_ref() ),* ]
             }
         }
-        impl<E,$t,$($tt),+> WidgetArrayMut<E> for &mut ($t,$($tt),+) where
+        impl<E,$t,$($tt),+> WidgetSliceMut<E> for &mut ($t,$($tt),+) where
             E: Env,
             $t: AsWidgetMut<E>,
             $($tt: AsWidgetMut<E>),+ 
@@ -385,7 +385,7 @@ impl_wpps_tuple!(
 );
 
 
-impl<T,E,const N: usize> WidgetArray<E> for [T;N] where T: AsWidget<E>, E: Env {
+impl<T,E,const N: usize> WidgetSlice<E> for [T;N] where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         N
@@ -416,7 +416,7 @@ impl<T,E,const N: usize> WidgetArray<E> for [T;N] where T: AsWidget<E>, E: Env {
             .collect::<Vec<_>>()
     }
 }
-impl<T,E,const N: usize> WidgetArrayMut<E> for [T;N] where T: AsWidgetMut<E>, E: Env {
+impl<T,E,const N: usize> WidgetSliceMut<E> for [T;N] where T: AsWidgetMut<E>, E: Env {
     #[inline]
     fn child_mut(&mut self, i: usize) -> Result<ResolvableMut<E>,()> {
         self.get_mut(i)
@@ -443,7 +443,7 @@ impl<T,E,const N: usize> WidgetArrayMut<E> for [T;N] where T: AsWidgetMut<E>, E:
             .collect::<Vec<_>>()
     }
 }
-impl<T,E,const N: usize> WidgetArray<E> for &[T;N] where T: AsWidget<E>, E: Env {
+impl<T,E,const N: usize> WidgetSlice<E> for &[T;N] where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         (**self).len()
@@ -473,7 +473,7 @@ impl<T,E,const N: usize> WidgetArray<E> for &[T;N] where T: AsWidget<E>, E: Env
             .collect::<Vec<_>>()
     }
 }
-impl<T,E,const N: usize> WidgetArray<E> for &mut [T;N] where T: AsWidget<E>, E: Env {
+impl<T,E,const N: usize> WidgetSlice<E> for &mut [T;N] where T: AsWidget<E>, E: Env {
     #[inline]
     fn len(&self) -> usize {
         (**self).len()
@@ -503,7 +503,7 @@ impl<T,E,const N: usize> WidgetArray<E> for &mut [T;N] where T: AsWidget<E>, E:
             .collect::<Vec<_>>()
     }
 }
-impl<T,E,const N: usize> WidgetArrayMut<E> for &mut [T;N] where T: AsWidgetMut<E>, E: Env {
+impl<T,E,const N: usize> WidgetSliceMut<E> for &mut [T;N] where T: AsWidgetMut<E>, E: Env {
     #[inline]
     fn child_mut(&mut self, i: usize) -> Result<ResolvableMut<E>,()> {
         self.get_mut(i)
diff --git a/src/widgets/pane/widget.rs b/src/widgets/pane/widget.rs
index 8a1b7bbe..a4bd9ccf 100644
--- a/src/widgets/pane/widget.rs
+++ b/src/widgets/pane/widget.rs
@@ -2,7 +2,7 @@ use super::*;
 
 impl<'w,E,T> Widget<E> for Pane<'w,E,T> where
     E: Env,
-    T: WidgetArray<E>,
+    T: WidgetSlice<E>,
 {
     fn id(&self) -> E::WidgetID {
         self.id.clone()
@@ -42,7 +42,7 @@ impl<'w,E,T> Widget<E> for Pane<'w,E,T> where
 }
 impl<'w,E,T> WidgetMut<E> for Pane<'w,E,T> where 
     E: Env,
-    T: WidgetArrayMut<E>+'w,
+    T: WidgetSliceMut<E>+'w,
 {
     fn _set_invalid(&mut self, v: bool) {
         let _ = v;
@@ -64,7 +64,7 @@ impl<'w,E,T> WidgetMut<E> for Pane<'w,E,T> where
 
 impl<'w,E,T> Pane<'w,E,T> where
     E: Env,
-    T: WidgetArray<E>,
+    T: WidgetSlice<E>,
 {
     pub fn _render_impl(&self, mut l: Link<E>, r: &mut RenderLink<E>) where
         E: Env,