From 0405ff4f895c20ff7745061de625c35ef6e72ac2 Mon Sep 17 00:00:00 2001 From: howardwu Date: Wed, 19 Aug 2020 03:00:30 -0700 Subject: [PATCH] Bump version and repair Leo update description --- Cargo.lock | 188 ++++++++++++++++++++++++++++++++++++----- Cargo.toml | 12 +-- ast/Cargo.toml | 2 +- compiler/Cargo.toml | 14 +-- gadgets/Cargo.toml | 2 +- input/Cargo.toml | 2 +- leo/commands/update.rs | 12 +-- leo/main.rs | 2 +- linter/Cargo.toml | 2 +- package/Cargo.toml | 2 +- state/Cargo.toml | 6 +- typed/Cargo.toml | 6 +- 12 files changed, 200 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 85d534da09..d745382431 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,6 +82,16 @@ 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.11.0" @@ -223,6 +233,16 @@ 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" @@ -350,6 +370,23 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "console" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b1aacfaffdbff75be81c15a399b4bedf78aaefe840e8af1d299ac2ade885d2" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "regex", + "terminal_size", + "termios", + "unicode-width", + "winapi 0.3.9", + "winapi-util", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -582,6 +619,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + [[package]] name = "dtoa" version = "0.4.6" @@ -594,6 +637,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd56b59865bce947ac5958779cfa508f6c3b9497cc762b7e24a12d11ccde2c4f" +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + [[package]] name = "encoding_rs" version = "0.8.23" @@ -864,7 +913,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -913,7 +962,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "itoa", ] @@ -924,7 +973,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes", + "bytes 0.5.6", "http", ] @@ -949,7 +998,7 @@ version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e68a8dd9716185d9e64ea473ea6ef63529252e3e27623295a0378a19665d5eb" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -967,13 +1016,30 @@ dependencies = [ "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", + "bytes 0.5.6", "hyper", "native-tls", "tokio", @@ -1001,6 +1067,18 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "indicatif" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8572bccfb0665e70b7faf44ee28841b8e0823450cd4ad562a76b5a3c4bf48487" +dependencies = [ + "console", + "lazy_static", + "number_prefix", + "regex", +] + [[package]] name = "inotify" version = "0.7.1" @@ -1107,6 +1185,12 @@ 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" @@ -1121,11 +1205,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leo" -version = "0.1.0" +version = "1.0.0" dependencies = [ "clap", "colored", + "console", "dirs", + "dotenv", "env_logger", "from-pest", "lazy_static", @@ -1141,6 +1227,7 @@ dependencies = [ "rand_core", "reqwest", "rusty-hook", + "self_update", "serde", "serde_json", "snarkos-algorithms", @@ -1156,7 +1243,7 @@ dependencies = [ [[package]] name = "leo-ast" -version = "0.1.0" +version = "1.0.0" dependencies = [ "criterion", "from-pest", @@ -1172,7 +1259,7 @@ dependencies = [ [[package]] name = "leo-compiler" -version = "0.1.0" +version = "1.0.0" dependencies = [ "bincode", "hex", @@ -1201,7 +1288,7 @@ dependencies = [ [[package]] name = "leo-gadgets" -version = "0.1.0" +version = "1.0.0" dependencies = [ "rand", "rand_xorshift", @@ -1213,7 +1300,7 @@ dependencies = [ [[package]] name = "leo-input" -version = "0.1.0" +version = "1.0.0" dependencies = [ "from-pest", "pest", @@ -1229,11 +1316,11 @@ dependencies = [ [[package]] name = "leo-linter" -version = "0.1.0" +version = "1.0.0" [[package]] name = "leo-package" -version = "0.1.0" +version = "1.0.0" dependencies = [ "log", "serde", @@ -1246,7 +1333,7 @@ dependencies = [ [[package]] name = "leo-state" -version = "0.1.0" +version = "1.0.0" dependencies = [ "leo-input", "leo-typed", @@ -1265,7 +1352,7 @@ dependencies = [ [[package]] name = "leo-typed" -version = "0.1.0" +version = "1.0.0" dependencies = [ "criterion", "leo-ast", @@ -1539,6 +1626,12 @@ dependencies = [ "libc", ] +[[package]] +name = "number_prefix" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" + [[package]] name = "object" version = "0.20.0" @@ -1634,6 +1727,12 @@ 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" @@ -1782,6 +1881,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-xml" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe1e430bdcf30c9fdc25053b9c459bb1a4672af4617b6c783d7d91dc17c6bbb0" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "0.6.13" @@ -1935,7 +2043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12427a5577082c24419c9c417db35cfeb65962efc7675bb6b0d5f1f9d315bfe6" dependencies = [ "base64 0.12.3", - "bytes", + "bytes 0.5.6", "encoding_rs", "futures-core", "futures-util", @@ -1950,7 +2058,7 @@ dependencies = [ "mime", "mime_guess", "native-tls", - "percent-encoding", + "percent-encoding 2.1.0", "pin-project-lite", "serde", "serde_json", @@ -2025,6 +2133,12 @@ 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" @@ -2073,6 +2187,23 @@ dependencies = [ "libc", ] +[[package]] +name = "self_update" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ad4f32cc38aac660a9a872b5553677d59f984139f3316f642989d8232be3e5c" +dependencies = [ + "hyper-old-types", + "indicatif", + "log", + "quick-xml", + "regex", + "reqwest", + "semver", + "serde_json", + "tempfile", +] + [[package]] name = "semver" version = "0.9.0" @@ -2456,6 +2587,25 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a14cd9f8c72704232f0bfc8455c0e861f0ad4eb60cc9ec8a170e231414c1e13" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "termios" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0fcee7b24a25675de40d5bb4de6e41b0df07bc9856295e7e2b3a3600c400c2" +dependencies = [ + "libc", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -2526,7 +2676,7 @@ version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" dependencies = [ - "bytes", + "bytes 0.5.6", "fnv", "futures-core", "iovec", @@ -2554,7 +2704,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes", + "bytes 0.5.6", "futures-core", "futures-sink", "log", @@ -2668,7 +2818,7 @@ checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" dependencies = [ "idna", "matches", - "percent-encoding", + "percent-encoding 2.1.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ef4acdf515..026f57d0e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" @@ -16,11 +16,11 @@ path = "leo/main.rs" members = [ "ast", "compiler", "gadgets", "input", "linter", "package", "typed", "state"] [dependencies] -leo-compiler = { path = "compiler", version = "0.1.0" } -leo-gadgets = { path = "gadgets", version = "0.1.0" } -leo-input = { path = "input", version = "0.1.0" } -leo-package = { path = "package", version = "0.1.0" } -leo-state = { path = "state", version = "0.1.0" } +leo-compiler = { path = "compiler", version = "1.0.0" } +leo-gadgets = { path = "gadgets", version = "1.0.0" } +leo-input = { path = "input", version = "1.0.0" } +leo-package = { path = "package", version = "1.0.0" } +leo-state = { path = "state", version = "1.0.0" } snarkos-algorithms = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-algorithms", default-features = false } snarkos-curves = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-curves", default-features = false } diff --git a/ast/Cargo.toml b/ast/Cargo.toml index 3cc755e559..fbbb31f333 100644 --- a/ast/Cargo.toml +++ b/ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-ast" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index db5ff685ac..e3d84ebc66 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "leo-compiler" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" [dependencies] -leo-ast = { path = "../ast", version = "0.1.0" } -leo-gadgets = { path = "../gadgets", version = "0.1.0" } -leo-input = { path = "../input", version = "0.1.0" } -leo-package = { path = "../package", version = "0.1.0"} -leo-typed = { path = "../typed", version = "0.1.0" } -leo-state = { path = "../state", version = "0.1.0" } +leo-ast = { path = "../ast", version = "1.0.0" } +leo-gadgets = { path = "../gadgets", version = "1.0.0" } +leo-input = { path = "../input", version = "1.0.0" } +leo-package = { path = "../package", version = "1.0.0"} +leo-typed = { path = "../typed", version = "1.0.0" } +leo-state = { path = "../state", version = "1.0.0" } snarkos-curves = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-curves", default-features = false } snarkos-dpc = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-dpc", default-features = false } diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml index 7fbba1cddf..d098dde721 100644 --- a/gadgets/Cargo.toml +++ b/gadgets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-gadgets" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" diff --git a/input/Cargo.toml b/input/Cargo.toml index aac1a61c3a..8bbc654b97 100644 --- a/input/Cargo.toml +++ b/input/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-input" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" diff --git a/leo/commands/update.rs b/leo/commands/update.rs index 5597011f0c..29e03b971c 100644 --- a/leo/commands/update.rs +++ b/leo/commands/update.rs @@ -34,7 +34,7 @@ impl UpdateCommand { .build()? .fetch()?; - log::info!("List of available Leo's verions"); + log::info!("List of available Leo's versions"); for release in releases { log::info!("* {}", release.version); } @@ -61,7 +61,7 @@ impl CLI for UpdateCommand { type Options = (bool,); type Output = (); - const ABOUT: AboutType = "Update Leo itself"; + const ABOUT: AboutType = "Update Leo to the latest version"; const ARGUMENTS: &'static [ArgumentType] = &[]; const FLAGS: &'static [FlagType] = &[("--list")]; const NAME: NameType = "update"; @@ -78,15 +78,15 @@ impl CLI for UpdateCommand { (true,) => match UpdateCommand::show_available_releases() { Ok(_) => return Ok(()), Err(e) => { - log::error!("Cannot get Leo version"); - log::error!("Log: {}", e); + log::error!("Could not fetch that latest version of Leo"); + log::error!("{}", e); } }, (false,) => match UpdateCommand::update_to_latest_release() { Ok(_) => return Ok(()), Err(e) => { - log::error!("Cannot update Leo"); - log::error!("Log: {}", e); + log::error!("Could not update Leo to the latest version"); + log::error!("{}", e); } }, } diff --git a/leo/main.rs b/leo/main.rs index 5d2fdae163..433596800e 100644 --- a/leo/main.rs +++ b/leo/main.rs @@ -21,7 +21,7 @@ use clap::{App, AppSettings, Arg}; #[cfg_attr(tarpaulin, skip)] fn main() -> Result<(), CLIError> { let arguments = App::new("leo") - .version("v0.1.0") + .version("v1.0.0") .about("Leo compiler and package manager") .author("The Aleo Team ") .settings(&[ diff --git a/linter/Cargo.toml b/linter/Cargo.toml index 9f733ad5ab..b17dd542c3 100644 --- a/linter/Cargo.toml +++ b/linter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-linter" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" diff --git a/package/Cargo.toml b/package/Cargo.toml index a15bb7454a..d88c335bdb 100644 --- a/package/Cargo.toml +++ b/package/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-package" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" diff --git a/state/Cargo.toml b/state/Cargo.toml index b7619ef19a..f908dbe7a7 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "leo-state" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" [dependencies] -leo-input = { path = "../input", version = "0.1.0" } -leo-typed = { path = "../typed", version = "0.1.0" } +leo-input = { path = "../input", version = "1.0.0" } +leo-typed = { path = "../typed", version = "1.0.0" } snarkos-algorithms = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-algorithms", default-features = false } snarkos-curves = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-curves", default-features = false } diff --git a/typed/Cargo.toml b/typed/Cargo.toml index f9ae56b6c4..a720c7a6a9 100644 --- a/typed/Cargo.toml +++ b/typed/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "leo-typed" -version = "0.1.0" +version = "1.0.0" authors = ["The Aleo Team "] edition = "2018" @@ -13,8 +13,8 @@ name = "typed_ast" harness = false [dependencies] -leo-ast = { path = "../ast", version = "0.1.0" } -leo-input = { path = "../input", version = "0.1.0" } +leo-ast = { path = "../ast", version = "1.0.0" } +leo-input = { path = "../input", version = "1.0.0" } snarkos-errors = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-errors", default-features = false } snarkos-models = { git = "ssh://git@github.com/AleoHQ/snarkOS.git", package = "snarkos-models", default-features = false }