Merge pull request #529 from AleoHQ/dependabot/cargo/self_update-0.23.0

Bump self_update from 0.22.0 to 0.23.0
This commit is contained in:
Collin Chin 2021-01-20 14:58:28 -05:00 committed by GitHub
commit 39d0222475
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 40 additions and 246 deletions

265
Cargo.lock generated
View File

@ -103,16 +103,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83"
[[package]]
name = "base64"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
dependencies = [
"byteorder",
"safemem",
]
[[package]]
name = "base64"
version = "0.13.0"
@ -248,16 +238,6 @@ version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "bytes"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
dependencies = [
"byteorder",
"iovec",
]
[[package]]
name = "bytes"
version = "0.5.6"
@ -765,7 +745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
dependencies = [
"matches",
"percent-encoding 2.1.0",
"percent-encoding",
]
[[package]]
@ -949,26 +929,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "h2"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
dependencies = [
"bytes 0.5.6",
"fnv",
"futures-core",
"futures-sink",
"futures-util",
"http",
"indexmap",
"slab",
"tokio 0.2.24",
"tokio-util 0.3.1",
"tracing",
"tracing-futures",
]
[[package]]
name = "h2"
version = "0.3.0"
@ -983,8 +943,8 @@ dependencies = [
"http",
"indexmap",
"slab",
"tokio 1.0.1",
"tokio-util 0.6.0",
"tokio",
"tokio-util",
"tracing",
"tracing-futures",
]
@ -1027,16 +987,6 @@ dependencies = [
"itoa",
]
[[package]]
name = "http-body"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
dependencies = [
"bytes 0.5.6",
"http",
]
[[package]]
name = "http-body"
version = "0.4.0"
@ -1068,30 +1018,6 @@ dependencies = [
"quick-error",
]
[[package]]
name = "hyper"
version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
dependencies = [
"bytes 0.5.6",
"futures-channel",
"futures-core",
"futures-util",
"h2 0.2.7",
"http",
"http-body 0.3.1",
"httparse",
"httpdate",
"itoa",
"pin-project 1.0.2",
"socket2",
"tokio 0.2.24",
"tower-service",
"tracing",
"want",
]
[[package]]
name = "hyper"
version = "0.14.2"
@ -1102,50 +1028,20 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
"h2 0.3.0",
"h2",
"http",
"http-body 0.4.0",
"http-body",
"httparse",
"httpdate",
"itoa",
"pin-project 1.0.2",
"socket2",
"tokio 1.0.1",
"tokio",
"tower-service",
"tracing",
"want",
]
[[package]]
name = "hyper-old-types"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6896be51ecf3966c0fa14ff2da3233dbb9aef57ccea1be1afe55f105f4d4c9c4"
dependencies = [
"base64 0.9.3",
"bytes 0.4.12",
"httparse",
"language-tags",
"log",
"mime",
"percent-encoding 1.0.1",
"time",
"unicase",
]
[[package]]
name = "hyper-tls"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed"
dependencies = [
"bytes 0.5.6",
"hyper 0.13.9",
"native-tls",
"tokio 0.2.24",
"tokio-tls",
]
[[package]]
name = "hyper-tls"
version = "0.5.0"
@ -1153,9 +1049,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes 1.0.0",
"hyper 0.14.2",
"hyper",
"native-tls",
"tokio 1.0.1",
"tokio",
"tokio-native-tls",
]
@ -1302,12 +1198,6 @@ dependencies = [
"winapi-build",
]
[[package]]
name = "language-tags"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
[[package]]
name = "lazy_static"
version = "1.4.0"
@ -1457,7 +1347,7 @@ dependencies = [
"num-bigint",
"rand",
"rand_core 0.6.1",
"reqwest 0.11.0",
"reqwest",
"rusty-hook",
"self_update",
"serde",
@ -1959,12 +1849,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
[[package]]
name = "percent-encoding"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
[[package]]
name = "percent-encoding"
version = "2.1.0"
@ -2067,12 +1951,6 @@ dependencies = [
"syn 1.0.58",
]
[[package]]
name = "pin-project-lite"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b"
[[package]]
name = "pin-project-lite"
version = "0.2.0"
@ -2295,57 +2173,21 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "reqwest"
version = "0.10.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c"
dependencies = [
"base64 0.13.0",
"bytes 0.5.6",
"encoding_rs",
"futures-core",
"futures-util",
"http",
"http-body 0.3.1",
"hyper 0.13.9",
"hyper-tls 0.4.3",
"ipnet",
"js-sys",
"lazy_static",
"log",
"mime",
"mime_guess",
"native-tls",
"percent-encoding 2.1.0",
"pin-project-lite 0.2.0",
"serde",
"serde_json",
"serde_urlencoded",
"tokio 0.2.24",
"tokio-tls",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"winreg",
]
[[package]]
name = "reqwest"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de"
dependencies = [
"base64 0.13.0",
"base64",
"bytes 1.0.0",
"encoding_rs",
"futures-core",
"futures-util",
"http",
"http-body 0.4.0",
"hyper 0.14.2",
"hyper-tls 0.5.0",
"http-body",
"hyper",
"hyper-tls",
"ipnet",
"js-sys",
"lazy_static",
@ -2353,12 +2195,12 @@ dependencies = [
"mime",
"mime_guess",
"native-tls",
"percent-encoding 2.1.0",
"pin-project-lite 0.2.0",
"percent-encoding",
"pin-project-lite",
"serde",
"serde_json",
"serde_urlencoded",
"tokio 1.0.1",
"tokio",
"tokio-native-tls",
"url",
"wasm-bindgen",
@ -2383,7 +2225,7 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
dependencies = [
"base64 0.13.0",
"base64",
"blake2b_simd",
"constant_time_eq",
"crossbeam-utils",
@ -2428,12 +2270,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "safemem"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]]
name = "same-file"
version = "1.0.6"
@ -2490,16 +2326,16 @@ dependencies = [
[[package]]
name = "self_update"
version = "0.22.0"
version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba18daf40a9db913cba8426cce84fa35abfc0872070fdf763dc7af9545e8a786"
checksum = "502f26626811e30581f6cb80ee588ccc709f8e490d14a4363f4b16f5d24cd7e2"
dependencies = [
"hyper-old-types",
"hyper",
"indicatif",
"log",
"quick-xml",
"regex",
"reqwest 0.10.10",
"reqwest",
"semver 0.11.0",
"serde_json",
"tempfile",
@ -3018,24 +2854,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
dependencies = [
"bytes 0.5.6",
"fnv",
"futures-core",
"iovec",
"lazy_static",
"memchr",
"mio 0.6.23",
"num_cpus",
"pin-project-lite 0.1.11",
"slab",
]
[[package]]
name = "tokio"
version = "1.0.1"
@ -3048,7 +2866,7 @@ dependencies = [
"memchr",
"mio 0.7.7",
"num_cpus",
"pin-project-lite 0.2.0",
"pin-project-lite",
]
[[package]]
@ -3058,7 +2876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [
"native-tls",
"tokio 1.0.1",
"tokio",
]
[[package]]
@ -3068,32 +2886,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457"
dependencies = [
"futures-core",
"pin-project-lite 0.2.0",
"tokio 1.0.1",
]
[[package]]
name = "tokio-tls"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"
dependencies = [
"native-tls",
"tokio 0.2.24",
]
[[package]]
name = "tokio-util"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
"bytes 0.5.6",
"futures-core",
"futures-sink",
"log",
"pin-project-lite 0.1.11",
"tokio 0.2.24",
"pin-project-lite",
"tokio",
]
[[package]]
@ -3106,8 +2900,8 @@ dependencies = [
"futures-core",
"futures-sink",
"log",
"pin-project-lite 0.2.0",
"tokio 1.0.1",
"pin-project-lite",
"tokio",
"tokio-stream",
]
@ -3133,8 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3"
dependencies = [
"cfg-if 1.0.0",
"log",
"pin-project-lite 0.2.0",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
@ -3284,7 +3077,7 @@ dependencies = [
"form_urlencoded",
"idna",
"matches",
"percent-encoding 2.1.0",
"percent-encoding",
]
[[package]]

View File

@ -126,7 +126,7 @@ version = "0.11.0"
features = [ "blocking", "json", "multipart" ]
[dependencies.self_update]
version = "0.22.0"
version = "0.23.0"
features = [ "archive-zip" ]
[dependencies.serde]

View File

@ -87,7 +87,7 @@ impl Ast {
/// Serializes the ast into a JSON string.
pub fn to_json_string(&self) -> Result<String, serde_json::Error> {
Ok(serde_json::to_string_pretty(&self.ast)?)
serde_json::to_string_pretty(&self.ast)
}
/// Deserializes the JSON string into a ast.

View File

@ -27,6 +27,7 @@ pub const REGISTERS_VARIABLE_NAME: &str = "registers";
pub const STATE_VARIABLE_NAME: &str = "state";
pub const STATE_LEAF_VARIABLE_NAME: &str = "state_leaf";
#[allow(clippy::vec_init_then_push)]
impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
pub fn allocate_input_keyword<CS: ConstraintSystem<F>>(
&mut self,

View File

@ -86,7 +86,7 @@ impl<'ast> Grammar<'ast> {
// and maintain a global cache of program strings during the compilation process.
/// Loads the Leo code as a string from the given file path.
pub fn load_file(file_path: &'ast Path) -> Result<String, ParserError> {
Ok(fs::read_to_string(file_path).map_err(|_| ParserError::FileReadError(file_path.to_owned()))?)
fs::read_to_string(file_path).map_err(|_| ParserError::FileReadError(file_path.to_owned()))
}
/// Returns a reference to the inner abstract syntax tree representation.

View File

@ -41,7 +41,7 @@ pub struct LeoInputParser;
impl LeoInputParser {
/// Reads in the given file path into a string.
pub fn load_file(file_path: &Path) -> Result<String, InputParserError> {
Ok(fs::read_to_string(file_path).map_err(|_| InputParserError::FileReadError(file_path.to_owned()))?)
fs::read_to_string(file_path).map_err(|_| InputParserError::FileReadError(file_path.to_owned()))
}
/// Parses the input file and constructs a syntax tree.

View File

@ -42,7 +42,7 @@ pub struct SerializedCircuit {
impl SerializedCircuit {
pub fn to_json_string(&self) -> Result<String, serde_json::Error> {
Ok(serde_json::to_string_pretty(&self)?)
serde_json::to_string_pretty(&self)
}
pub fn from_json_string(json: &str) -> Result<Self, serde_json::Error> {

View File

@ -49,7 +49,7 @@ impl ChecksumFile {
pub fn read_from(&self, path: &Path) -> Result<String, ChecksumFileError> {
let path = self.setup_file_path(path);
Ok(fs::read_to_string(&path).map_err(|_| ChecksumFileError::FileReadError(path.into_owned()))?)
fs::read_to_string(&path).map_err(|_| ChecksumFileError::FileReadError(path.into_owned()))
}
/// Writes the given checksum to a file.

View File

@ -49,7 +49,7 @@ impl CircuitFile {
pub fn read_from(&self, path: &Path) -> Result<String, CircuitFileError> {
let path = self.setup_file_path(path);
Ok(fs::read_to_string(&path).map_err(|_| CircuitFileError::FileReadError(path.into_owned()))?)
fs::read_to_string(&path).map_err(|_| CircuitFileError::FileReadError(path.into_owned()))
}
/// Writes the given serialized circuit to a file.

View File

@ -53,7 +53,7 @@ impl ProvingKeyFile {
pub fn read_from(&self, path: &Path) -> Result<Vec<u8>, ProvingKeyFileError> {
let path = self.setup_file_path(path);
Ok(fs::read(&path).map_err(|_| ProvingKeyFileError::FileReadError(path.into_owned()))?)
fs::read(&path).map_err(|_| ProvingKeyFileError::FileReadError(path.into_owned()))
}
/// Writes the given proving key to a file.

View File

@ -53,7 +53,7 @@ impl VerificationKeyFile {
pub fn read_from(&self, path: &Path) -> Result<Vec<u8>, VerificationKeyFileError> {
let path = self.setup_file_path(path);
Ok(fs::read(&path).map_err(|_| VerificationKeyFileError::FileReadError(path.into_owned()))?)
fs::read(&path).map_err(|_| VerificationKeyFileError::FileReadError(path.into_owned()))
}
/// Writes the given verification key to a file.

View File

@ -214,6 +214,6 @@ author = "{author}"
}
// Read the toml file
Ok(toml::from_str(&final_toml).map_err(|error| ManifestError::Parsing(MANIFEST_FILENAME, error))?)
toml::from_str(&final_toml).map_err(|error| ManifestError::Parsing(MANIFEST_FILENAME, error))
}
}