From 711164a7a24ab832006b72cac162e78cf434861a Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 4 Aug 2019 11:11:37 +0200
Subject: Remove old-style optional literals

---
 dhall_syntax/src/printer.rs | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'dhall_syntax/src/printer.rs')

diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index dbed55d..b585a5b 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -32,12 +32,6 @@ impl<SE: Display + Clone, E: Display> Display for ExprF<SE, E> {
             NEListLit(es) => {
                 fmt_list("[", ", ", "]", es, f, Display::fmt)?;
             }
-            OldOptionalLit(None, t) => {
-                write!(f, "[] : Optional {}", t)?;
-            }
-            OldOptionalLit(Some(x), t) => {
-                write!(f, "[{}] : Optional {}", x, t)?;
-            }
             SomeLit(e) => {
                 write!(f, "Some {}", e)?;
             }
@@ -154,7 +148,6 @@ impl<S: Clone, A: Display + Clone> Expr<S, A> {
             | Let(_, _, _, _)
             | EmptyListLit(_)
             | NEListLit(_)
-            | OldOptionalLit(_, _)
             | SomeLit(_)
             | Merge(_, _, _)
             | Annot(_, _)
@@ -190,7 +183,6 @@ impl<S: Clone, A: Display + Clone> Expr<S, A> {
                 b.phase(PrintPhase::BinOp(op)),
             ),
             EmptyListLit(t) => EmptyListLit(t.phase(Import)),
-            OldOptionalLit(x, t) => OldOptionalLit(x, t.phase(Import)),
             SomeLit(e) => SomeLit(e.phase(Import)),
             ExprF::App(f, a) => ExprF::App(f.phase(Import), a.phase(Import)),
             Field(a, b) => Field(a.phase(Primitive), b),
-- 
cgit v1.2.3


From 482be29e0f03e10c2469ef80bdd6ac7593207dc5 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 6 Aug 2019 20:38:06 +0200
Subject: RFC3986 URLs

---
 dhall_syntax/src/printer.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dhall_syntax/src/printer.rs')

diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index b585a5b..2b2bbcc 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -435,6 +435,7 @@ impl Display for Import {
         match self.mode {
             Code => {}
             RawText => write!(f, " as Text")?,
+            Location => write!(f, " as Location")?,
         }
         Ok(())
     }
-- 
cgit v1.2.3


From 705433487da3cd3b4517fcf74b0497c76dbb4080 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 6 Aug 2019 22:36:43 +0200
Subject: Prepare for https://github.com/dhall-lang/dhall-lang/pull/630

---
 dhall_syntax/src/printer.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'dhall_syntax/src/printer.rs')

diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index 2b2bbcc..52d3d81 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -27,7 +27,7 @@ impl<SE: Display + Clone, E: Display> Display for ExprF<SE, E> {
                 write!(f, " = {} in {}", c, d)?;
             }
             EmptyListLit(t) => {
-                write!(f, "[] : List {}", t)?;
+                write!(f, "[] : {}", t)?;
             }
             NEListLit(es) => {
                 fmt_list("[", ", ", "]", es, f, Display::fmt)?;
@@ -182,7 +182,6 @@ impl<S: Clone, A: Display + Clone> Expr<S, A> {
                 a.phase(PrintPhase::BinOp(op)),
                 b.phase(PrintPhase::BinOp(op)),
             ),
-            EmptyListLit(t) => EmptyListLit(t.phase(Import)),
             SomeLit(e) => SomeLit(e.phase(Import)),
             ExprF::App(f, a) => ExprF::App(f.phase(Import), a.phase(Import)),
             Field(a, b) => Field(a.phase(Primitive), b),
-- 
cgit v1.2.3


From d248762095908246951b6aa6c211587c6e333c0e Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 7 Aug 2019 21:05:01 +0200
Subject: Remove union literals from the language

---
 dhall_syntax/src/printer.rs | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'dhall_syntax/src/printer.rs')

diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index 52d3d81..db688bd 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -85,16 +85,6 @@ impl<SE: Display + Clone, E: Display> Display for ExprF<SE, E> {
                 }
                 Ok(())
             })?,
-            UnionLit(a, b, c) => {
-                write!(f, "< {} = {}", a, b)?;
-                for (k, v) in c {
-                    write!(f, " | {}", k)?;
-                    if let Some(v) = v {
-                        write!(f, ": {}", v)?;
-                    }
-                }
-                f.write_str(" >")?
-            }
             Embed(a) => a.fmt(f)?,
         }
         Ok(())
-- 
cgit v1.2.3


From 51c4f79fe092191d670ffa2f9098693079dbc1be Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 7 Aug 2019 21:18:11 +0200
Subject: Add truncated Natural subtraction

---
 dhall_syntax/src/printer.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dhall_syntax/src/printer.rs')

diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index db688bd..1d6c113 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -449,6 +449,7 @@ impl Display for Builtin {
             NaturalOdd => "Natural/odd",
             NaturalToInteger => "Natural/toInteger",
             NaturalShow => "Natural/show",
+            NaturalSubtract => "Natural/subtract",
             IntegerToDouble => "Integer/toDouble",
             IntegerShow => "Integer/show",
             DoubleShow => "Double/show",
-- 
cgit v1.2.3