Refactor layout types 🚧

1 files changed, 8 insertions, 4 deletions

diff --git a/src/parsing/mod.rs b/src/parsing/mod.rs
index 344f3577..7d2c3d21 100644
--- a/src/parsing/mod.rs
+++ b/src/parsing/mod.rs
@@ -432,8 +432,8 @@ error_type! {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::func::{Function, Scope};
-    use crate::layout::{LayoutContext, LayoutResult, Layout};
+    use crate::func::{Function, FuncCommands, Scope};
+    use crate::layout::{LayoutContext, LayoutResult};
     use Node::{Space as S, Newline as N, Func as F};
     use funcs::*;
 
@@ -456,7 +456,9 @@ mod tests {
                 }
             }
 
-            fn layout(&self, _: LayoutContext) -> LayoutResult<Option<Layout>> { Ok(None) }
+            fn layout(&self, _: LayoutContext) -> LayoutResult<FuncCommands> {
+                Ok(FuncCommands::new())
+            }
         }
 
         /// A testing function without a body.
@@ -473,7 +475,9 @@ mod tests {
                 }
             }
 
-            fn layout(&self, _: LayoutContext) -> LayoutResult<Option<Layout>> { Ok(None) }
+            fn layout(&self, _: LayoutContext) -> LayoutResult<FuncCommands> {
+                Ok(FuncCommands::new())
+            }
         }
     }