Merge branch 'fix-recursive-imports' into leo-manifest-dependencies

This commit is contained in:
damirka 2021-08-18 14:13:21 +03:00
commit 135ad2d167
6 changed files with 15 additions and 15 deletions

20
Cargo.lock generated
View File

@ -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"
@ -2458,9 +2458,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",
@ -2474,9 +2474,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",
@ -2519,9 +2519,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",
@ -2632,9 +2632,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",

View File

@ -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]

View File

@ -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]

View File

@ -58,8 +58,8 @@ impl<'a> ImportResolver<'a> for ImportParser<'a> {
return Ok(Some(program.clone()));
}
let path = self.program_path.clone();
let mut imports = self.clone(); // Self::default() was previously
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() })?;

View File

@ -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]

View File

@ -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]