From 159b2ccede0d5559fe3ff9681ccfff314e608b35 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 20 Mar 2020 11:09:51 +0000
Subject: Parse RFC3986 URLs

---
 dhall/build.rs | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'dhall/build.rs')

diff --git a/dhall/build.rs b/dhall/build.rs
index e6ed0da..c81b302 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -163,11 +163,6 @@ fn generate_tests() -> std::io::Result<()> {
                 false
                     // Pretty sure the test is incorrect
                     || path == "unit/import/urls/quotedPathFakeUrlEncode"
-                    // TODO: RFC3986 URLs
-                    || path == "unit/import/urls/emptyPath0"
-                    || path == "unit/import/urls/emptyPath1"
-                    || path == "unit/import/urls/emptyPathSegment"
-                    || path == "usingToMap"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
@@ -186,14 +181,7 @@ fn generate_tests() -> std::io::Result<()> {
             directory: "parser/success/",
             variant: "Printer",
             too_slow_path: Box::new(|path: &str| path == "largeExpression"),
-            exclude_path: Box::new(|path: &str| {
-                false
-                    // TODO: RFC3986 URLs
-                    || path == "unit/import/urls/emptyPath0"
-                    || path == "unit/import/urls/emptyPath1"
-                    || path == "unit/import/urls/emptyPathSegment"
-                    || path == "usingToMap"
-            }),
+            exclude_path: Box::new(|_path: &str| false),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
         },
@@ -210,11 +198,6 @@ fn generate_tests() -> std::io::Result<()> {
                     || path == "double"
                     || path == "unit/DoubleLitExponentNoDot"
                     || path == "unit/DoubleLitSecretelyInt"
-                    // TODO: RFC3986 URLs
-                    || path == "unit/import/urls/emptyPath0"
-                    || path == "unit/import/urls/emptyPath1"
-                    || path == "unit/import/urls/emptyPathSegment"
-                    || path == "usingToMap"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Binary),
@@ -373,10 +356,6 @@ fn convert_abnf_to_pest() -> std::io::Result<()> {
     let mut file = File::create(grammar_path)?;
     writeln!(&mut file, "// AUTO-GENERATED FILE. See build.rs.")?;
 
-    // TODO: this is a cheat; properly support RFC3986 URLs instead
-    rules.remove("url_path");
-    writeln!(&mut file, "url_path = _{{ path }}")?;
-
     // Work around some greediness issue in the grammar.
     rules.remove("missing");
     writeln!(
-- 
cgit v1.2.3