diff --git a/dizzle b/dizzle index 5426dc4..ab177b0 160000 --- a/dizzle +++ b/dizzle @@ -1 +1 @@ -Subproject commit 5426dc44f231531758a7e8575117357b55b1a9f5 +Subproject commit ab177b0d0d1ccdff0c69f915847be9a23a364663 diff --git a/src/layout.rs b/src/layout.rs index 108f013..09755a1 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -163,9 +163,9 @@ impl Sizer { $state: &S, $output: &mut O, $expr: &str ) -> Perhaps> where S: Interpret>> - + for<'b> Namespace<'b, bool> - + for<'b> Namespace<'b, O::Unit> - + for<'b> Namespace<'b, Option> + + Namespace + + Namespace + + Namespace> $body } } @@ -177,10 +177,10 @@ impl Sizer { $state: &S, $output: &mut Tui, $expr: &str ) -> Perhaps> where S: Interpret>> - + for<'b> Namespace<'b, bool> - + for<'b> Namespace<'b, u16> - + for<'b> Namespace<'b, Option> - + for<'b> Namespace<'b, Color> + + Namespace + + Namespace + + Namespace> + + Namespace $body } } diff --git a/src/term/modify.rs b/src/term/modify.rs index 118aeb7..9542452 100644 --- a/src/term/modify.rs +++ b/src/term/modify.rs @@ -30,7 +30,7 @@ fn_kw_layout_tui!(kw_tui_bg |state, output, expr| { }); impl Tui { - pub fn eval_color_expr (state: &impl for<'a> Namespace<'a, u8>, src: impl Language) + pub fn eval_color_expr (state: &impl Namespace, src: impl Language) -> Perhaps { if let Some(expr) = src.expr()? {