Skip to content

refactor: Rename WidgetArray to WidgetSlice #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qwertz19281 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: Rename WidgetArray to WidgetSlice #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;
Expand Down
2 changes: 1 addition & 1 deletion src/widget/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ™️
Expand Down
34 changes: 17 additions & 17 deletions src/widget/array.rs → src/widget/slice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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>),+
Expand Down Expand Up @@ -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>),+
Expand Down Expand Up @@ -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>),+
Expand Down Expand Up @@ -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>),+
Expand Down Expand Up @@ -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>),+
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/widgets/pane/widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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;
Expand All @@ -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,
Expand Down