diff options
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | abnf_to_pest/src/lib.rs | 2 | ||||
| -rw-r--r-- | dhall_parser/Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall_parser/src/dhall.pest.visibility | 1 |
4 files changed, 18 insertions, 7 deletions
@@ -77,7 +77,7 @@ version = "0.1.0" dependencies = [ "abnf_to_pest 0.1.0", "pest 2.1.0 (git+https://github.com/pest-parser/pest)", - "pest_derive 2.1.0", + "pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -158,6 +158,7 @@ dependencies = [ [[package]] name = "pest" version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "ucd-trie 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -165,17 +166,19 @@ dependencies = [ [[package]] name = "pest_derive" version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pest 2.1.0", - "pest_generator 2.1.0", + "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pest_generator" version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "pest 2.1.0", - "pest_meta 2.1.0", + "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -184,9 +187,10 @@ dependencies = [ [[package]] name = "pest_meta" version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "maplit 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.0", + "pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -304,6 +308,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" "checksum nom 4.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4836e9d6036552017e107edc598c97b2dee245161ff1b1ad4af215004774b354" "checksum pest 2.1.0 (git+https://github.com/pest-parser/pest)" = "<none>" +"checksum pest 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54f0c72a98d8ab3c99560bfd16df8059cc10e1f9a8e83e6e3b97718dd766e9c3" +"checksum pest_derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +"checksum pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "63120576c4efd69615b5537d3d052257328a4ca82876771d6944424ccfd9f646" +"checksum pest_meta 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5a3492a4ed208ffc247adcdcc7ba2a95be3104f58877d0d02f0df39bf3efb5e" "checksum pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3" "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1" diff --git a/abnf_to_pest/src/lib.rs b/abnf_to_pest/src/lib.rs index 38347ed..8d858bb 100644 --- a/abnf_to_pest/src/lib.rs +++ b/abnf_to_pest/src/lib.rs @@ -51,6 +51,8 @@ pub fn abnf_to_pest( || x == "let" || x == "in" || x == "fn" + // TODO: remove when https://github.com/pest-parser/pest/pull/375 gets into a release + || x == "whitespace" { x + "_" } else { diff --git a/dhall_parser/Cargo.toml b/dhall_parser/Cargo.toml index be76fa0..a73d445 100644 --- a/dhall_parser/Cargo.toml +++ b/dhall_parser/Cargo.toml @@ -14,4 +14,4 @@ abnf_to_pest = { path = "../abnf_to_pest" } [dependencies] pest = { git = "https://github.com/pest-parser/pest" } -pest_derive = { version = "2.1", path = "../../pest/derive" } +pest_derive = "2.1" diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_parser/src/dhall.pest.visibility index f9c9d0b..5dcaa19 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_parser/src/dhall.pest.visibility @@ -8,6 +8,7 @@ end_of_line # line_comment # whitespace_chunk # whitespace +# whitespace_ # nonempty_whitespace # ALPHA # DIGIT |