From e2344edde6505c78fe63e62326f18d940a8d070a Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Fri, 10 Feb 2023 17:24:44 +0530 Subject: [PATCH] Fix layout replace for unit layouts --- src/lua/util.rs | 4 ++-- src/ui.rs | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lua/util.rs b/src/lua/util.rs index a4bfa77..bffcb09 100644 --- a/src/lua/util.rs +++ b/src/lua/util.rs @@ -761,8 +761,8 @@ pub fn textwrap<'a>(util: Table<'a>, lua: &Lua) -> Result> { /// ``` pub fn layout_replace<'a>(util: Table<'a>, lua: &Lua) -> Result> { let func = lua.create_function( - move |lua, (layout, target, replacement): (Table, Value, Value)| { - let layout: Layout = lua.from_value(Value::Table(layout))?; + move |lua, (layout, target, replacement): (Value, Value, Value)| { + let layout: Layout = lua.from_value(layout)?; let target: Layout = lua.from_value(target)?; let replacement: Layout = lua.from_value(replacement)?; diff --git a/src/ui.rs b/src/ui.rs index 92de37b..f22fb0d 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -1615,5 +1615,11 @@ mod tests { } _ => panic!("Unexpected layout"), } + + let res = Layout::Table.replace(&Layout::Table, &Layout::Selection); + assert_eq!(res, Layout::Selection); + + let res = Layout::Table.replace(&Layout::Nothing, &Layout::Selection); + assert_eq!(res, Layout::Table); } }