From cb2097ed82c7aa23f555cb27a7e27a32863de09a Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 22 Dec 2019 20:08:42 +0000 Subject: Update dhall-lang submodule --- dhall/build.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'dhall') diff --git a/dhall/build.rs b/dhall/build.rs index 2a65f24..7beaa9f 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -128,6 +128,8 @@ fn generate_tests() -> std::io::Result<()> { || path == "unit/import/urls/emptyPath0" || path == "unit/import/urls/emptyPath1" || path == "unit/import/urls/emptyPathSegment" + // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973 + || path == "preferMissingNoSpaces" }), input_type: FileType::Text, output_type: Some(FileType::Binary), @@ -152,6 +154,8 @@ fn generate_tests() -> std::io::Result<()> { || path == "unit/import/urls/emptyPath0" || path == "unit/import/urls/emptyPath1" || path == "unit/import/urls/emptyPathSegment" + // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973 + || path == "preferMissingNoSpaces" }), input_type: FileType::Text, output_type: Some(FileType::Binary), @@ -174,6 +178,8 @@ fn generate_tests() -> std::io::Result<()> { || path == "unit/import/urls/emptyPath0" || path == "unit/import/urls/emptyPath1" || path == "unit/import/urls/emptyPathSegment" + // TODO: https://github.com/dhall-lang/dhall-lang/pull/788#issuecomment-568298973 + || path == "preferMissingNoSpaces" }), input_type: FileType::Text, output_type: Some(FileType::Binary), @@ -385,6 +391,7 @@ fn convert_abnf_to_pest() -> std::io::Result<()> { let mut data = read_to_string(abnf_path)?; data.push('\n'); + let data = data.replace('∀', ""); // See https://github.com/duesee/abnf/issues/11 let mut rules = abnf_to_pest::parse_abnf(&data)?; for line in BufReader::new(File::open(visibility_path)?).lines() { @@ -401,6 +408,12 @@ fn convert_abnf_to_pest() -> std::io::Result<()> { rules.remove("url_path"); writeln!(&mut file, "url_path = _{{ path }}")?; + rules.remove("missing"); + writeln!( + &mut file, + r#"missing = {{ "missing" ~ !simple_label_next_char }}"# + )?; + rules.remove("simple_label"); writeln!( &mut file, -- cgit v1.2.3