From 1694a2d0f4873f8d9c46c3781b541e62da21c991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20L=C3=BChne?= <patrick@luehne.de>
Date: Tue, 4 Feb 2020 23:47:12 +0100
Subject: [PATCH] Minor restructuring

---
 src/format.rs | 64 +++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/format.rs b/src/format.rs
index 443224a..482ab16 100644
--- a/src/format.rs
+++ b/src/format.rs
@@ -1,35 +1,3 @@
-struct TermDisplay<'term>
-{
-	parent_precedence: Option<i32>,
-	term: &'term crate::Term,
-}
-
-fn display_term<'term>(term: &'term crate::Term, parent_precedence: Option<i32>)
-	-> TermDisplay<'term>
-{
-	TermDisplay
-	{
-		parent_precedence,
-		term,
-	}
-}
-
-struct FormulaDisplay<'formula>
-{
-	parent_precedence: Option<i32>,
-	formula: &'formula crate::Formula,
-}
-
-fn display_formula<'formula>(formula: &'formula crate::Formula, parent_precedence: Option<i32>)
-	-> FormulaDisplay<'formula>
-{
-	FormulaDisplay
-	{
-		parent_precedence,
-		formula,
-	}
-}
-
 trait Precedence
 {
 	fn precedence(&self) -> i32;
@@ -108,6 +76,22 @@ impl std::fmt::Display for crate::VariableDeclaration
 	}
 }
 
+struct TermDisplay<'term>
+{
+	parent_precedence: Option<i32>,
+	term: &'term crate::Term,
+}
+
+fn display_term<'term>(term: &'term crate::Term, parent_precedence: Option<i32>)
+	-> TermDisplay<'term>
+{
+	TermDisplay
+	{
+		parent_precedence,
+		term,
+	}
+}
+
 impl<'term> std::fmt::Debug for TermDisplay<'term>
 {
 	fn fmt(&self, format: &mut std::fmt::Formatter) -> std::fmt::Result
@@ -195,6 +179,22 @@ impl<'term> std::fmt::Display for TermDisplay<'term>
 	}
 }
 
+struct FormulaDisplay<'formula>
+{
+	parent_precedence: Option<i32>,
+	formula: &'formula crate::Formula,
+}
+
+fn display_formula<'formula>(formula: &'formula crate::Formula, parent_precedence: Option<i32>)
+	-> FormulaDisplay<'formula>
+{
+	FormulaDisplay
+	{
+		parent_precedence,
+		formula,
+	}
+}
+
 impl<'formula> std::fmt::Debug for FormulaDisplay<'formula>
 {
 	fn fmt(&self, format: &mut std::fmt::Formatter) -> std::fmt::Result