From c0ffe443c1f10994e08d72a2fa1ccaffb0b00523 Mon Sep 17 00:00:00 2001 From: Alessandro Coglio Date: Mon, 4 Apr 2022 20:47:57 -0700 Subject: [PATCH 1/7] [ABNF] Add numerals to tokens. In the currently restricted version of Leo, this is necessary for the numerals in affine group literals to be tokens. No change necessary to the lexer/parser, which already handle this properly. --- docs/grammar/README.md | 3 ++- docs/grammar/abnf-grammar.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/grammar/README.md b/docs/grammar/README.md index f2957eb7a8..6c390fb859 100644 --- a/docs/grammar/README.md +++ b/docs/grammar/README.md @@ -401,10 +401,11 @@ symbol = "!" / "&&" / "||" token = keyword / identifier / atomic-literal + / numeral / symbol ``` -Go to: _[atomic-literal](#user-content-atomic-literal), [identifier](#user-content-identifier), [keyword](#user-content-keyword), [symbol](#user-content-symbol)_; +Go to: _[atomic-literal](#user-content-atomic-literal), [identifier](#user-content-identifier), [keyword](#user-content-keyword), [numeral](#user-content-numeral), [symbol](#user-content-symbol)_; diff --git a/docs/grammar/abnf-grammar.txt b/docs/grammar/abnf-grammar.txt index ba86642858..191ae40fda 100644 --- a/docs/grammar/abnf-grammar.txt +++ b/docs/grammar/abnf-grammar.txt @@ -181,6 +181,7 @@ symbol = "!" / "&&" / "||" token = keyword / identifier / atomic-literal + / numeral / symbol lexeme = token / comment / whitespace From 2a63ab7c4711998d8d0d99613cd6abcd4820548b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:17:54 +0000 Subject: [PATCH 2/7] Bump eyre from 0.6.7 to 0.6.8 Bumps [eyre](https://github.com/yaahc/eyre) from 0.6.7 to 0.6.8. - [Release notes](https://github.com/yaahc/eyre/releases) - [Changelog](https://github.com/yaahc/eyre/blob/master/CHANGELOG.md) - [Commits](https://github.com/yaahc/eyre/compare/v0.6.7...v0.6.8) --- updated-dependencies: - dependency-name: eyre dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- leo/errors/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..c26a4b22fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -559,9 +559,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9289ed2c0440a6536e65119725cf91fc2c6b5e513bfd2e36e1134d7cca6ca12f" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" dependencies = [ "indenter", "once_cell", diff --git a/leo/errors/Cargo.toml b/leo/errors/Cargo.toml index db0b886495..1664506b2e 100644 --- a/leo/errors/Cargo.toml +++ b/leo/errors/Cargo.toml @@ -35,7 +35,7 @@ version = "0.5.1" version = "2.2.0" [dependencies.eyre] -version = "0.6.7" +version = "0.6.8" default-features = false [dependencies.serde] From 07a2bc1484f9143ef52d7517695f59154b78c144 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:18:04 +0000 Subject: [PATCH 3/7] Bump clap from 3.1.6 to 3.1.8 Bumps [clap](https://github.com/clap-rs/clap) from 3.1.6 to 3.1.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.1.6...v3.1.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..b5740b634d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.6" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", "bitflags", @@ -1126,7 +1126,7 @@ version = "1.5.3" dependencies = [ "ansi_term", "assert_cmd", - "clap 3.1.6", + "clap 3.1.8", "color-backtrace", "colored", "console", From 2fe921fb42d5c126bcda5abdac844f8a245811f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:18:12 +0000 Subject: [PATCH 4/7] Bump indexmap from 1.8.0 to 1.8.1 Bumps [indexmap](https://github.com/bluss/indexmap) from 1.8.0 to 1.8.1. - [Release notes](https://github.com/bluss/indexmap/releases) - [Changelog](https://github.com/bluss/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/bluss/indexmap/compare/1.8.0...1.8.1) --- updated-dependencies: - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..371942c606 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -934,9 +934,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", From 4b1b78b28045d8677b9924d4fc70dcbe10ecb0d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:18:19 +0000 Subject: [PATCH 5/7] Bump tracing-subscriber from 0.3.9 to 0.3.10 Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.3.9 to 0.3.10. - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.9...tracing-subscriber-0.3.10) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..24a349a68c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2506,9 +2506,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" +checksum = "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52" dependencies = [ "ansi_term", "sharded-slab", diff --git a/Cargo.toml b/Cargo.toml index 7a0b36ba6b..bd869a476c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,7 +106,7 @@ version = "0.5" version = "0.1" [dependencies.tracing-subscriber] -version = "0.3.9" +version = "0.3.10" features = [ "fmt" ] [dependencies.zip] From ba9ba76c7ce1561acf9e3d6e62147951109229db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:18:25 +0000 Subject: [PATCH 6/7] Bump tendril from 0.4.2 to 0.4.3 Bumps [tendril](https://github.com/servo/tendril) from 0.4.2 to 0.4.3. - [Release notes](https://github.com/servo/tendril/releases) - [Commits](https://github.com/servo/tendril/compare/v0.4.2...v0.4.3) --- updated-dependencies: - dependency-name: tendril dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- leo/errors/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..1045c9f063 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -674,9 +674,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ "mac", "new_debug_unreachable", @@ -2276,9 +2276,9 @@ dependencies = [ [[package]] name = "tendril" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ "futf", "mac", diff --git a/leo/errors/Cargo.toml b/leo/errors/Cargo.toml index db0b886495..91d6acc955 100644 --- a/leo/errors/Cargo.toml +++ b/leo/errors/Cargo.toml @@ -43,7 +43,7 @@ version = "1.0.133" features = [ "derive", "rc" ] [dependencies.tendril] -version = "0.4.2" +version = "0.4.3" [dependencies.thiserror] version = "1.0.30" From 9e81228ea6f3641c15a709f695a40b06f39c3675 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Apr 2022 10:18:31 +0000 Subject: [PATCH 7/7] Bump test_dir from 0.1.0 to 0.2.0 Bumps [test_dir](https://github.com/rpacholek/test_dir) from 0.1.0 to 0.2.0. - [Release notes](https://github.com/rpacholek/test_dir/releases) - [Commits](https://github.com/rpacholek/test_dir/commits) --- updated-dependencies: - dependency-name: test_dir dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 88 ++++++++++-------------------------------------------- Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fd675137b..a517bee5ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,17 +758,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.4" @@ -777,7 +766,7 @@ checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1137,8 +1126,8 @@ dependencies = [ "leo-errors", "leo-package", "notify", - "rand 0.8.4", - "rand_core 0.6.3", + "rand", + "rand_core", "reqwest", "rusty-hook", "self_update", @@ -1565,7 +1554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core", "subtle", ] @@ -1735,19 +1724,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - [[package]] name = "rand" version = "0.8.4" @@ -1755,19 +1731,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] @@ -1777,16 +1743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1795,16 +1752,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.4", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1813,7 +1761,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.3", + "rand_core", ] [[package]] @@ -1856,7 +1804,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.4", + "getrandom", "redox_syscall", ] @@ -2191,7 +2139,7 @@ dependencies = [ "bincode", "itertools", "num-bigint", - "rand 0.8.4", + "rand", "serde", "snarkvm-derives", "thiserror", @@ -2312,11 +2260,11 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "test_dir" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e571ebf9127a9da821890a9fa8a8ef777fce3e0f959ff6949cf06ca8b736381d" +checksum = "1fc19daf9fc57fadcf740c4abaaa0cd08d9ce22a2a0629aaf6cbd9ae4b80683a" dependencies = [ - "rand 0.7.3", + "rand", ] [[package]] @@ -2650,12 +2598,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 7a0b36ba6b..4e67d37841 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,7 +122,7 @@ version = "2.0.4" version = "0.11.2" [dev-dependencies.test_dir] -version = "0.1.0" +version = "0.2.0" [features] default = [ ]