From 5a9a5859eec0cf7deebf7fa07fe99f8dc8722ec8 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Sun, 1 Mar 2020 19:37:24 +0000
Subject: Implement remote `as Location` resolution

---
 dhall/src/syntax/text/printer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/syntax/text/printer.rs')

diff --git a/dhall/src/syntax/text/printer.rs b/dhall/src/syntax/text/printer.rs
index 8891d41..53f2c8f 100644
--- a/dhall/src/syntax/text/printer.rs
+++ b/dhall/src/syntax/text/printer.rs
@@ -406,7 +406,7 @@ impl<SubExpr: Display> Display for Import<SubExpr> {
                 f.write_str(&path)?;
             }
             Remote(url) => {
-                write!(f, "{}://{}/", url.scheme, url.authority,)?;
+                write!(f, "{}://{}/", url.scheme, url.authority)?;
                 let path: String = url.path.file_path.iter().join("/");
                 f.write_str(&path)?;
                 if let Some(q) = &url.query {
-- 
cgit v1.2.3


From 903d6c0bba36a6696eb337ae84b962f4cc48b5b5 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Wed, 4 Mar 2020 21:26:01 +0000
Subject: Implement remote imports and cleanup import chaining

---
 dhall/src/syntax/text/printer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dhall/src/syntax/text/printer.rs')

diff --git a/dhall/src/syntax/text/printer.rs b/dhall/src/syntax/text/printer.rs
index 53f2c8f..5bb987b 100644
--- a/dhall/src/syntax/text/printer.rs
+++ b/dhall/src/syntax/text/printer.rs
@@ -379,8 +379,8 @@ impl Display for Hash {
 impl<SubExpr: Display> Display for Import<SubExpr> {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         use FilePrefix::*;
-        use ImportLocation::*;
         use ImportMode::*;
+        use ImportTarget::*;
         let quote_if_needed = |s: &str| -> String {
             if s.chars().all(|c| c.is_ascii_alphanumeric()) {
                 s.to_string()
-- 
cgit v1.2.3