From 0a087cd28bbee5fcdffbb9d49b0ba9f413ad7f92 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Fri, 24 Jan 2020 16:23:57 +0100
Subject: =?UTF-8?q?Reorganize=20modules=20=F0=9F=A7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/lib.rs')

diff --git a/src/lib.rs b/src/lib.rs
index 3ebe34c2..946e16d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -25,22 +25,24 @@ use smallvec::smallvec;
 
 use toddle::query::{FontLoader, FontProvider, SharedFontLoader};
 
-use crate::func::Scope;
-use crate::layout::{Layouted, MultiLayout};
-use crate::syntax::{parse, ParseContext, Parsed, SyntaxModel, Position};
+use crate::layout::MultiLayout;
+use crate::layout::prelude::*;
+use crate::layout::{LayoutContext, Layouted, layout};
 use crate::style::{LayoutStyle, PageStyle, TextStyle};
+use crate::syntax::{SyntaxModel, Scope, ParseContext, Parsed, parse};
+use crate::syntax::span::Position;
 
 #[macro_use]
 mod macros;
-pub mod export;
 pub mod error;
+pub mod export;
 #[macro_use]
 pub mod func;
 pub mod layout;
 pub mod library;
-pub mod syntax;
 pub mod size;
 pub mod style;
+pub mod syntax;
 
 
 /// Transforms source code into typesetted layouts.
@@ -93,7 +95,6 @@ impl<'p> Typesetter<'p> {
 
     /// Layout a syntax tree and return the produced layout.
     pub async fn layout(&self, model: &SyntaxModel) -> Layouted<MultiLayout> {
-        use crate::layout::prelude::*;
         let margins = self.style.page.margins();
         layout(
             &model,
-- 
cgit v1.2.3