From 1b34fa0538c720b346f3c93cdbe73c3da791d1b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 10:18:57 +0000 Subject: [PATCH 1/3] Bump snarkvm-curves from 0.7.8 to 0.7.9 Bumps [snarkvm-curves](https://github.com/AleoHQ/snarkVM) from 0.7.8 to 0.7.9. - [Release notes](https://github.com/AleoHQ/snarkVM/releases) - [Commits](https://github.com/AleoHQ/snarkVM/compare/v0.7.8...v0.7.9) --- updated-dependencies: - dependency-name: snarkvm-curves dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- compiler/Cargo.toml | 2 +- state/Cargo.toml | 2 +- synthesizer/Cargo.toml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f109d381e2..28aa497906 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2456,9 +2456,9 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "010ae5c95693279db519e4a8525a8a3145edc8e36198efdfaf250622f4540cc1" +checksum = "83b4de7cd1533c67dd386058b631d7e5ea8b2063ebca212159b13fc1a94ff4a7" dependencies = [ "derivative", "rand 0.8.4", @@ -2472,9 +2472,9 @@ dependencies = [ [[package]] name = "snarkvm-derives" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e963ae4209f0166a619ab9266ce71c6f9228861ec55615a1b6154d673ffc158" +checksum = "3e854888634305d8c5c79fe59adaae593971a8b29d3148834f698141b16c2c7b" dependencies = [ "proc-macro-crate", "proc-macro-error", @@ -2517,9 +2517,9 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761cb4c19d6685ac9d1d3a6eb1619600334bcf80dc6ac742cc38f4fe349ba871" +checksum = "bca141a8eae489ea39600b04f0a642059ce076bd3a7d21704b38b90fc87c37f0" dependencies = [ "anyhow", "bincode", @@ -2630,9 +2630,9 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0842ff685e625cb7a2f9ddc7ca1b1560d2a3e3a7220099781a28ea54564133b" +checksum = "a6d1565a7c2a320b711308188adf84980013872e579ae2e6abffe8796eb8e6fe" dependencies = [ "anyhow", "bincode", diff --git a/Cargo.toml b/Cargo.toml index b87e85071a..f7c3af674c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ version = "1.5.3" version = "0.7.6" [dependencies.snarkvm-curves] -version = "0.7.8" +version = "0.7.9" default-features = false [dependencies.snarkvm-gadgets] diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 013630af82..a61e03c12b 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -57,7 +57,7 @@ version = "1.5.3" version = "0.4" [dependencies.snarkvm-curves] -version = "0.7.8" +version = "0.7.9" default-features = false [dependencies.snarkvm-fields] diff --git a/state/Cargo.toml b/state/Cargo.toml index c84a45b0d8..f57fbdbc1f 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -29,7 +29,7 @@ version = "1.5.3" version = "0.7.6" [dependencies.snarkvm-curves] -version = "0.7.8" +version = "0.7.9" default-features = false [dependencies.snarkvm-dpc] diff --git a/synthesizer/Cargo.toml b/synthesizer/Cargo.toml index cf681a35db..a4f2280b6b 100644 --- a/synthesizer/Cargo.toml +++ b/synthesizer/Cargo.toml @@ -18,7 +18,7 @@ license = "GPL-3.0" edition = "2018" [dependencies.snarkvm-curves] -version = "0.7.8" +version = "0.7.9" default-features = false [dependencies.snarkvm-fields] From 957d2ef62d314e49fdf2291df836094929d284d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 10:19:17 +0000 Subject: [PATCH 2/3] Bump anyhow from 1.0.42 to 1.0.43 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.42 to 1.0.43. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.42...1.0.43) --- updated-dependencies: - dependency-name: anyhow 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 f109d381e2..973892613c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "arrayvec" From b6d9db20be1a23b2c071eed470a57c8beadd2271 Mon Sep 17 00:00:00 2001 From: yangvenli Date: Tue, 17 Aug 2021 15:47:16 +0300 Subject: [PATCH 3/3] fixes recursive imports issue --- imports/src/parser/import_parser.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imports/src/parser/import_parser.rs b/imports/src/parser/import_parser.rs index c8fcfdf43a..01b7702dd8 100644 --- a/imports/src/parser/import_parser.rs +++ b/imports/src/parser/import_parser.rs @@ -55,10 +55,9 @@ impl<'a> ImportResolver<'a> for ImportParser<'a> { if let Some(program) = self.imports.get(&full_path) { return Ok(Some(program.clone())); } - let mut imports = Self::default(); let path = self.program_path.clone(); - self.partial_imports.insert(full_path.clone()); + let mut imports = self.clone(); // Self::default() was previously let program = imports .parse_package(context, path, package_segments, span) .map_err(|x| -> AsgConvertError { x.into() })?;