From 4e04652b8e5ecc8c96234a42632a7b7573c0b623 Mon Sep 17 00:00:00 2001 From: Dan Wilhelm Date: Sat, 12 Jan 2019 01:12:38 -0800 Subject: [PATCH 01/16] Remove redundant or misleading Command configs `child::run` overrides the stdout config, so is misleading to to set it differently beforehand. `child::run` uses `spawn()`, which inherits stdin by default. So, no need to set stdin to default beforehand, particularly when the spawned program is non-interactive. --- src/npm.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/npm.rs b/src/npm.rs index 6b09e63a..4066b0d2 100644 --- a/src/npm.rs +++ b/src/npm.rs @@ -4,7 +4,7 @@ use child; use command::publish::access::Access; use failure::{self, ResultExt}; use slog::Logger; -use std::process::{Command, Stdio}; +use std::process::Command; /// The default npm registry used when we aren't working with a custom registry. pub const DEFAULT_NPM_REGISTRY: &'static str = "https://registry.npmjs.org/"; @@ -24,14 +24,8 @@ pub fn npm_publish(log: &Logger, path: &str, access: Option) -> Result<( Some(a) => cmd .current_dir(path) .arg("publish") - .arg(&format!("{}", a.to_string())) - .stdin(Stdio::inherit()) - .stdout(Stdio::inherit()), - None => cmd - .current_dir(path) - .arg("publish") - .stdin(Stdio::inherit()) - .stdout(Stdio::inherit()), + .arg(&format!("{}", a.to_string())), + None => cmd.current_dir(path).arg("publish"), }; child::run(log, cmd, "npm publish").context("Publishing to npm failed")?; @@ -52,7 +46,7 @@ pub fn npm_login( args.push(format!("--scope={}", scope)); } - if always_auth == true { + if always_auth { args.push(format!("--always_auth")); } From 3e995c8bd96b37f041d6130fb35ca7e69b34a060 Mon Sep 17 00:00:00 2001 From: Dan Wilhelm Date: Sat, 12 Jan 2019 02:21:25 -0800 Subject: [PATCH 02/16] Fix npm error when spawned in Windows Issue #277 - Affects running login, pack, and publish on Windows. `Command::new("npm")` launched `npm` with quotes, `"npm"`, causing a run-time error on Windows. Now, `Command::new` is wrapped by `child::new_command(program: &str)`. This prepends `cmd /c` to the program name if `cfg!(windows)`. See rustc: #42436, #42791, #44542 --- src/child.rs | 30 ++++++++++++++++++++++-------- src/npm.rs | 7 +++---- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/child.rs b/src/child.rs index e312c205..72c8e870 100644 --- a/src/child.rs +++ b/src/child.rs @@ -7,7 +7,9 @@ use failure::Error; use slog::Logger; use std::{ io::{self, Read}, - mem, process, string, + mem, + process::{Command, Stdio}, + string, sync::mpsc, thread, }; @@ -19,6 +21,22 @@ enum OutputFragment { Stderr(Vec), } +/// Return a new Command object +pub fn new_command(program: &str) -> Command { + // On Windows, initializes launching as `cmd /c `. + // Initializing only with `Command::new("npm")` will launch + // `npm` with quotes, `"npm"`, causing a run-time error on Windows. + // See rustc: #42436, #42791, #44542 + + if cfg!(windows) { + let mut cmd = Command::new("cmd"); + cmd.arg("/c").arg(program); + cmd + } else { + Command::new(program) + } +} + /// Read data from the give reader and send it as an `OutputFragment` over the /// given sender. fn read_and_send( @@ -115,16 +133,12 @@ where } /// Run the given command and return its stdout. -pub fn run( - logger: &Logger, - mut command: process::Command, - command_name: &str, -) -> Result { +pub fn run(logger: &Logger, mut command: Command, command_name: &str) -> Result { info!(logger, "Running {:?}", command); let mut child = command - .stdout(process::Stdio::piped()) - .stderr(process::Stdio::piped()) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) .spawn()?; let stdout = child.stdout.take().unwrap(); diff --git a/src/npm.rs b/src/npm.rs index 4066b0d2..74a02508 100644 --- a/src/npm.rs +++ b/src/npm.rs @@ -4,14 +4,13 @@ use child; use command::publish::access::Access; use failure::{self, ResultExt}; use slog::Logger; -use std::process::Command; /// The default npm registry used when we aren't working with a custom registry. pub const DEFAULT_NPM_REGISTRY: &'static str = "https://registry.npmjs.org/"; /// Run the `npm pack` command. pub fn npm_pack(log: &Logger, path: &str) -> Result<(), failure::Error> { - let mut cmd = Command::new("npm"); + let mut cmd = child::new_command("npm"); cmd.current_dir(path).arg("pack"); child::run(log, cmd, "npm pack").context("Packaging up your code failed")?; Ok(()) @@ -19,7 +18,7 @@ pub fn npm_pack(log: &Logger, path: &str) -> Result<(), failure::Error> { /// Run the `npm publish` command. pub fn npm_publish(log: &Logger, path: &str, access: Option) -> Result<(), failure::Error> { - let mut cmd = Command::new("npm"); + let mut cmd = child::new_command("npm"); match access { Some(a) => cmd .current_dir(path) @@ -56,7 +55,7 @@ pub fn npm_login( // Interactively ask user for npm login info. // (child::run does not support interactive input) - let mut cmd = Command::new("npm"); + let mut cmd = child::new_command("npm"); cmd.args(args); info!(log, "Running {:?}", cmd); From c4c3b9ec7e6fcf25c76fd030a76d49ec988f70d7 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 5 Nov 2018 15:30:25 -0800 Subject: [PATCH 03/16] Replace `slog` with `log` This commit replaces the `slog` family of crates used by `wasm-pack` with the `log` crate plus `env_logger`. This also means that by default `wasm-pack` also won't create a `wasm-pack.log` file in the current directory. Enabling logging will now be done through `RUST_LOG=wasm_pack` instead of `-v` flags. Closes #425 --- Cargo.lock | 397 ++++++++++++++++++------------------- Cargo.toml | 8 +- src/bindgen.rs | 29 +-- src/build.rs | 19 +- src/child.rs | 10 +- src/command/build.rs | 89 ++++----- src/command/login.rs | 17 +- src/command/mod.rs | 34 ++-- src/command/pack.rs | 14 +- src/command/publish/mod.rs | 13 +- src/command/test.rs | 96 +++++---- src/lib.rs | 6 +- src/logger.rs | 76 ------- src/main.rs | 7 +- src/npm.rs | 13 +- src/test/mod.rs | 14 +- tests/all/main.rs | 2 - tests/all/utils/fixture.rs | 9 +- tests/all/utils/logger.rs | 6 - tests/all/utils/mod.rs | 1 - 20 files changed, 356 insertions(+), 504 deletions(-) delete mode 100644 src/logger.rs delete mode 100644 tests/all/utils/logger.rs diff --git a/Cargo.lock b/Cargo.lock index eb3fba54..77ac158d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -59,8 +59,8 @@ dependencies = [ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -70,7 +70,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -103,7 +103,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -112,7 +112,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -122,9 +122,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -137,16 +137,6 @@ name = "cfg-if" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "chrono" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "clap" version = "2.32.0" @@ -168,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -179,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -199,8 +189,8 @@ dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -216,8 +206,8 @@ dependencies = [ "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -250,9 +240,9 @@ name = "curl" version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -262,11 +252,11 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -289,7 +279,7 @@ name = "dirs" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -299,6 +289,17 @@ name = "encode_unicode" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "env_logger" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "error-chain" version = "0.12.0" @@ -309,21 +310,21 @@ dependencies = [ [[package]] name = "failure" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "failure_derive" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -333,8 +334,8 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -343,7 +344,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -399,10 +400,10 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -410,25 +411,22 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.9.0" +name = "humantime" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "console 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "isatty" -version = "0.1.9" +name = "indicatif" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "console 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -457,7 +455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.45" +version = "0.2.46" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -476,7 +474,7 @@ version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -490,13 +488,21 @@ dependencies = [ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "log" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "memchr" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -506,7 +512,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -524,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -533,19 +539,6 @@ name = "nodrop" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "num-integer" -version = "0.1.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "num-traits" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "openssl" version = "0.10.16" @@ -555,7 +548,7 @@ dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -578,7 +571,7 @@ version = "0.9.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,7 +604,7 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -623,7 +616,7 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -635,8 +628,8 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -660,6 +653,11 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "quick-error" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "quote" version = "0.6.10" @@ -674,17 +672,19 @@ version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -695,36 +695,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_chacha" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -756,6 +755,19 @@ dependencies = [ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rand_os" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand_pcg" version = "0.1.1" @@ -767,7 +779,15 @@ dependencies = [ [[package]] name = "rand_xorshift" -version = "0.1.0" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rdrand" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -775,7 +795,7 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.44" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -783,7 +803,7 @@ name = "redox_termios" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -792,9 +812,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -847,7 +867,7 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -896,7 +916,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -906,17 +926,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -924,17 +944,17 @@ name = "serde_ignored" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -942,33 +962,6 @@ name = "siphasher" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "slog" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "slog-async" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "slog-term" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "smallvec" version = "0.6.7" @@ -983,8 +976,8 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1020,12 +1013,12 @@ dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.23" +version = "0.15.24" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1040,23 +1033,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "take_mut" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "tar" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1065,7 +1053,7 @@ name = "tempdir" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1075,9 +1063,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1087,28 +1075,27 @@ version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "term" -version = "0.5.1" +name = "termcolor" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "termcolor" -version = "0.3.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1116,8 +1103,8 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1126,7 +1113,7 @@ name = "termios" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1147,11 +1134,11 @@ dependencies = [ [[package]] name = "time" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1160,7 +1147,7 @@ name = "toml" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1202,7 +1189,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1242,21 +1229,23 @@ dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", + "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1272,7 +1261,7 @@ version = "0.1.0" dependencies = [ "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1285,8 +1274,8 @@ name = "which" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1334,12 +1323,21 @@ dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wincolor" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "xattr" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1351,7 +1349,7 @@ dependencies = [ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] @@ -1373,7 +1371,6 @@ dependencies = [ "checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe" "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749" "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4" -"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878" "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e" "checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1" "checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" @@ -1384,13 +1381,14 @@ dependencies = [ "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" "checksum curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c7c9d851c825e0c033979d4516c9173bc19a78a96eb4d6ae51d4045440eafa16" -"checksum curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "721c204978be2143fab0a84b708c49d79d1f6100b8785610f456043a90708870" +"checksum curl-sys 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ca79238a79fb294be6173b4057c95b22a718c94c4e38475d5faa82b8383f3502" "checksum dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9" "checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a" "checksum encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd" +"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" -"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7" -"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596" +"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" +"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" "checksum filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646" "checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -1401,23 +1399,22 @@ dependencies = [ "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" +"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a29b2fa6f00010c268bface64c18bb0310aaa70d46a195d5382d288c477fb016" -"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc" "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" -"checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74" +"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" "checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" "checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9" "checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" "checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c" "checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" -"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" -"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" "checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9" "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" "checksum openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)" = "26bb632127731bf4ac49bf86a5dde12d2ca0918c2234fc39d79d4da2ccbc6da7" @@ -1425,25 +1422,28 @@ dependencies = [ "checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" -"checksum parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9723236a9525c757d9725b993511e3fc941e33f27751942232f0058298297edf" +"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" +"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" -"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" +"checksum rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dee497e66d8d76bf08ce20c8d36e16f93749ab0bf89975b4f8ae5cee660c2da2" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" -"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" -"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a" +"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5" +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca" "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05" -"checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3" -"checksum redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "a84bcd297b87a545980a2d25a0beb72a1f490c31f0a9fde52fca35bfbb1ceb70" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26" "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" @@ -1451,7 +1451,7 @@ dependencies = [ "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" -"checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7" +"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" @@ -1460,14 +1460,11 @@ dependencies = [ "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)" = "157e12af46859e968da75dea9845530e13d03bcab2009a41b9b7bb3cf4eb3ec2" -"checksum serde_derive 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)" = "9469829702497daf2daf3c190e130c3fa72f719920f73c86160d43e8f8d76951" +"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7" +"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b" "checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" -"checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811" +"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -"checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e" -"checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f" -"checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b" "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" @@ -1475,20 +1472,19 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3" "checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04" -"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc" +"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" -"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" "checksum tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" "checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" "checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" -"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561" "checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" +"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" "checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" -"checksum time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "847da467bf0db05882a9e2375934a8a55cffdc9db0d128af1518200260ba1f6c" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" "checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1" @@ -1510,5 +1506,6 @@ dependencies = [ "checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" +"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" "checksum xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" "checksum zip 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00acf1fafb786ff450b6726e5be41ef029142597b47a40ce80f952f1471730a0" diff --git a/Cargo.toml b/Cargo.toml index dcf45e96..69b21b37 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,21 +14,23 @@ atty = "0.2.11" cargo_metadata = "0.6.0" console = "0.6.1" dialoguer = "0.3.0" +curl = "0.4.13" +dirs = "1.0.4" +env_logger = { version = "0.5.13", default-features = false } failure = "0.1.2" human-panic = "1.0.1" glob = "0.2" indicatif = "0.9.0" lazy_static = "1.1.0" +log = "0.4.6" openssl = { version = '0.10.11', optional = true } parking_lot = "0.6" serde = "1.0.74" serde_derive = "1.0.74" serde_ignored = "0.0.4" serde_json = "1.0.26" -slog = "2.3" -slog-term = "2.4" -slog-async = "2.3" strsim = "0.8.0" +siphasher = "0.2.3" structopt = "0.2" toml = "0.4" which = "2.0.0" diff --git a/src/bindgen.rs b/src/bindgen.rs index 0a849506..c2ad7b25 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -4,9 +4,10 @@ use child; use command::build::BuildProfile; use emoji; use failure::{self, ResultExt}; +use log::debug; +use log::{info, warn}; use manifest::CrateData; use progressbar::Step; -use slog::Logger; use std::fs; use std::path::{Path, PathBuf}; use std::process::Command; @@ -26,7 +27,6 @@ pub fn install_wasm_bindgen( version: &str, install_permitted: bool, step: &Step, - log: &Logger, ) -> Result { // If `wasm-bindgen` is installed globally and it has the right version, use // that. Assume that other tools are installed next to it. @@ -34,12 +34,8 @@ pub fn install_wasm_bindgen( // This situation can arise if `wasm-bindgen` is already installed via // `cargo install`, for example. if let Ok(path) = which("wasm-bindgen") { - debug!( - log, - "found global wasm-bindgen binary at: {}", - path.display() - ); - if wasm_bindgen_version_check(&path, version, log) { + debug!("found global wasm-bindgen binary at: {}", path.display()); + if wasm_bindgen_version_check(&path, version) { return Ok(Download::at(path.parent().unwrap())); } } @@ -52,14 +48,13 @@ pub fn install_wasm_bindgen( Ok(dl) => return Ok(dl), Err(e) => { warn!( - log, "could not download pre-built `wasm-bindgen`: {}. Falling back to `cargo install`.", e ); } } - cargo_install_wasm_bindgen(log, &cache, version, install_permitted) + cargo_install_wasm_bindgen(&cache, version, install_permitted) } /// Downloads a precompiled copy of wasm-bindgen, if available. @@ -102,7 +97,6 @@ fn prebuilt_url(version: &str) -> Option { /// Use `cargo install` to install the `wasm-bindgen` CLI locally into the given /// crate. pub fn cargo_install_wasm_bindgen( - logger: &Logger, cache: &Cache, version: &str, install_permitted: bool, @@ -132,7 +126,7 @@ pub fn cargo_install_wasm_bindgen( .arg("--root") .arg(&tmp); - child::run(logger, cmd, "cargo install").context("Installing wasm-bindgen with cargo")?; + child::run(cmd, "cargo install").context("Installing wasm-bindgen with cargo")?; fs::rename(&tmp, &destination)?; Ok(Download::at(&destination)) @@ -148,7 +142,6 @@ pub fn wasm_bindgen_build( target: &str, profile: BuildProfile, step: &Step, - log: &Logger, ) -> Result<(), failure::Error> { let msg = format!("{}Running WASM-bindgen...", emoji::RUNNER); PBAR.step(step, &msg); @@ -196,15 +189,15 @@ pub fn wasm_bindgen_build( cmd.arg("--keep-debug"); } - child::run(log, cmd, "wasm-bindgen").context("Running the wasm-bindgen CLI")?; + child::run(cmd, "wasm-bindgen").context("Running the wasm-bindgen CLI")?; Ok(()) } /// Check if the `wasm-bindgen` dependency is locally satisfied. -fn wasm_bindgen_version_check(bindgen_path: &PathBuf, dep_version: &str, log: &Logger) -> bool { +fn wasm_bindgen_version_check(bindgen_path: &PathBuf, dep_version: &str) -> bool { let mut cmd = Command::new(bindgen_path); cmd.arg("--version"); - child::run(log, cmd, "wasm-bindgen") + child::run(cmd, "wasm-bindgen") .map(|stdout| { stdout .trim() @@ -212,10 +205,8 @@ fn wasm_bindgen_version_check(bindgen_path: &PathBuf, dep_version: &str, log: &L .nth(1) .map(|v| { info!( - log, "Checking installed `wasm-bindgen` version == expected version: {} == {}", - v, - dep_version + v, dep_version ); v == dep_version }) diff --git a/src/build.rs b/src/build.rs index 4628d37c..e240c436 100644 --- a/src/build.rs +++ b/src/build.rs @@ -5,7 +5,6 @@ use command::build::BuildProfile; use emoji; use failure::{Error, ResultExt}; use progressbar::Step; -use slog::Logger; use std::path::Path; use std::process::Command; use std::str; @@ -52,23 +51,17 @@ fn rustc_minor_version() -> Option { /// Ensure that `rustup` has the `wasm32-unknown-unknown` target installed for /// current toolchain -pub fn rustup_add_wasm_target(log: &Logger, step: &Step) -> Result<(), Error> { +pub fn rustup_add_wasm_target(step: &Step) -> Result<(), Error> { let msg = format!("{}Adding WASM target...", emoji::TARGET); PBAR.step(step, &msg); let mut cmd = Command::new("rustup"); cmd.arg("target").arg("add").arg("wasm32-unknown-unknown"); - child::run(log, cmd, "rustup") - .context("Adding the wasm32-unknown-unknown target with rustup")?; + child::run(cmd, "rustup").context("Adding the wasm32-unknown-unknown target with rustup")?; Ok(()) } /// Run `cargo build` targetting `wasm32-unknown-unknown`. -pub fn cargo_build_wasm( - log: &Logger, - path: &Path, - profile: BuildProfile, - step: &Step, -) -> Result<(), Error> { +pub fn cargo_build_wasm(path: &Path, profile: BuildProfile, step: &Step) -> Result<(), Error> { let msg = format!("{}Compiling to WASM...", emoji::CYCLONE); PBAR.step(step, &msg); let mut cmd = Command::new("cargo"); @@ -91,18 +84,18 @@ pub fn cargo_build_wasm( } } cmd.arg("--target").arg("wasm32-unknown-unknown"); - child::run(log, cmd, "cargo build").context("Compiling your crate to WebAssembly failed")?; + child::run(cmd, "cargo build").context("Compiling your crate to WebAssembly failed")?; Ok(()) } /// Run `cargo build --tests` targetting `wasm32-unknown-unknown`. -pub fn cargo_build_wasm_tests(log: &Logger, path: &Path, debug: bool) -> Result<(), Error> { +pub fn cargo_build_wasm_tests(path: &Path, debug: bool) -> Result<(), Error> { let mut cmd = Command::new("cargo"); cmd.current_dir(path).arg("build").arg("--tests"); if !debug { cmd.arg("--release"); } cmd.arg("--target").arg("wasm32-unknown-unknown"); - child::run(log, cmd, "cargo build").context("Compilation of your program failed")?; + child::run(cmd, "cargo build").context("Compilation of your program failed")?; Ok(()) } diff --git a/src/child.rs b/src/child.rs index 72c8e870..6558ebdb 100644 --- a/src/child.rs +++ b/src/child.rs @@ -4,7 +4,7 @@ //! properly logged and their output is logged as well. use failure::Error; -use slog::Logger; +use log::info; use std::{ io::{self, Read}, mem, @@ -133,8 +133,8 @@ where } /// Run the given command and return its stdout. -pub fn run(logger: &Logger, mut command: Command, command_name: &str) -> Result { - info!(logger, "Running {:?}", command); +pub fn run(mut command: Command, command_name: &str) -> Result { + info!("Running {:?}", command); let mut child = command .stdout(Stdio::piped()) @@ -158,11 +158,11 @@ pub fn run(logger: &Logger, mut command: Command, command_name: &str) -> Result< thread::spawn(move || read_and_send(stderr, stderr_send, OutputFragment::Stderr)); let mut stdout = OutputAccumulator::new(|line| { - info!(logger, "{} (stdout): {}", command_name, line); + info!("{} (stdout): {}", command_name, line); PBAR.message(line) }); let mut stderr = OutputAccumulator::new(|line| { - info!(logger, "{} (stderr): {}", command_name, line); + info!("{} (stderr): {}", command_name, line); PBAR.message(line) }); diff --git a/src/command/build.rs b/src/command/build.rs index 9a5a152a..4b1efa46 100644 --- a/src/command/build.rs +++ b/src/command/build.rs @@ -8,10 +8,10 @@ use failure::Error; use indicatif::HumanDuration; use license; use lockfile::Lockfile; +use log::info; use manifest; use progressbar::Step; use readme; -use slog::Logger; use std::path::PathBuf; use std::str::FromStr; use std::time::Instant; @@ -139,7 +139,7 @@ impl Default for BuildOptions { } } -type BuildStep = fn(&mut Build, &Step, &Logger) -> Result<(), Error>; +type BuildStep = fn(&mut Build, &Step) -> Result<(), Error>; impl Build { /// Construct a build command from the given options. @@ -184,7 +184,7 @@ impl Build { } /// Execute this `Build` command. - pub fn run(&mut self, log: &Logger) -> Result<(), Error> { + pub fn run(&mut self) -> Result<(), Error> { let process_steps = Build::get_process_steps(&self.mode); let mut step_counter = Step::new(process_steps.len()); @@ -192,14 +192,13 @@ impl Build { let started = Instant::now(); for (_, process_step) in process_steps { - process_step(self, &step_counter, log)?; + process_step(self, &step_counter)?; step_counter.inc(); } let duration = HumanDuration(started.elapsed()); - info!(&log, "Done in {}.", &duration); + info!("Done in {}.", &duration); info!( - &log, "Your wasm pkg is ready to publish at {}.", self.out_dir.display() ); @@ -259,34 +258,33 @@ impl Build { } } - fn step_check_rustc_version(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Checking rustc version..."); + fn step_check_rustc_version(&mut self, step: &Step) -> Result<(), Error> { + info!("Checking rustc version..."); let version = build::check_rustc_version(step)?; let msg = format!("rustc version is {}.", version); - info!(&log, "{}", &msg); + info!("{}", &msg); Ok(()) } - fn step_check_crate_config(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Checking crate configuration..."); + fn step_check_crate_config(&mut self, step: &Step) -> Result<(), Error> { + info!("Checking crate configuration..."); self.crate_data.check_crate_config(step)?; - info!(&log, "Crate is correctly configured."); + info!("Crate is correctly configured."); Ok(()) } - fn step_add_wasm_target(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Adding wasm-target..."); - build::rustup_add_wasm_target(log, step)?; - info!(&log, "Adding wasm-target was successful."); + fn step_add_wasm_target(&mut self, step: &Step) -> Result<(), Error> { + info!("Adding wasm-target..."); + build::rustup_add_wasm_target(step)?; + info!("Adding wasm-target was successful."); Ok(()) } - fn step_build_wasm(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Building wasm..."); - build::cargo_build_wasm(log, &self.crate_path, self.profile, step)?; + fn step_build_wasm(&mut self, step: &Step) -> Result<(), Error> { + info!("Building wasm..."); + build::cargo_build_wasm(&self.crate_path, self.profile, step)?; info!( - &log, "wasm built at {:#?}.", &self .crate_path @@ -297,15 +295,15 @@ impl Build { Ok(()) } - fn step_create_dir(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Creating a pkg directory..."); + fn step_create_dir(&mut self, step: &Step) -> Result<(), Error> { + info!("Creating a pkg directory..."); create_pkg_dir(&self.out_dir, step)?; - info!(&log, "Created a pkg directory at {:#?}.", &self.crate_path); + info!("Created a pkg directory at {:#?}.", &self.crate_path); Ok(()) } - fn step_create_json(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Writing a package.json..."); + fn step_create_json(&mut self, step: &Step) -> Result<(), Error> { + info!("Writing a package.json..."); self.crate_data.write_package_json( &self.out_dir, &self.scope, @@ -314,55 +312,45 @@ impl Build { step, )?; info!( - &log, "Wrote a package.json at {:#?}.", &self.out_dir.join("package.json") ); Ok(()) } - fn step_copy_readme(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Copying readme from crate..."); + fn step_copy_readme(&mut self, step: &Step) -> Result<(), Error> { + info!("Copying readme from crate..."); readme::copy_from_crate(&self.crate_path, &self.out_dir, step)?; - info!(&log, "Copied readme from crate to {:#?}.", &self.out_dir); + info!("Copied readme from crate to {:#?}.", &self.out_dir); Ok(()) } - fn step_copy_license(&mut self, step: &Step, log: &Logger) -> Result<(), failure::Error> { - info!(&log, "Copying license from crate..."); + fn step_copy_license(&mut self, step: &Step) -> Result<(), failure::Error> { + info!("Copying license from crate..."); license::copy_from_crate(&self.crate_data, &self.crate_path, &self.out_dir, step)?; - info!(&log, "Copied license from crate to {:#?}.", &self.out_dir); + info!("Copied license from crate to {:#?}.", &self.out_dir); Ok(()) } - fn step_install_wasm_bindgen( - &mut self, - step: &Step, - log: &Logger, - ) -> Result<(), failure::Error> { - info!(&log, "Identifying wasm-bindgen dependency..."); + fn step_install_wasm_bindgen(&mut self, step: &Step) -> Result<(), failure::Error> { + info!("Identifying wasm-bindgen dependency..."); let lockfile = Lockfile::new(&self.crate_data)?; let bindgen_version = lockfile.require_wasm_bindgen()?; - info!(&log, "Installing wasm-bindgen-cli..."); + info!("Installing wasm-bindgen-cli..."); let install_permitted = match self.mode { BuildMode::Normal => true, BuildMode::Force => true, BuildMode::Noinstall => false, }; - let bindgen = bindgen::install_wasm_bindgen( - &self.cache, - &bindgen_version, - install_permitted, - step, - log, - )?; + let bindgen = + bindgen::install_wasm_bindgen(&self.cache, &bindgen_version, install_permitted, step)?; self.bindgen = Some(bindgen); - info!(&log, "Installing wasm-bindgen-cli was successful."); + info!("Installing wasm-bindgen-cli was successful."); Ok(()) } - fn step_run_wasm_bindgen(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Building the wasm bindings..."); + fn step_run_wasm_bindgen(&mut self, step: &Step) -> Result<(), Error> { + info!("Building the wasm bindings..."); bindgen::wasm_bindgen_build( &self.crate_data, self.bindgen.as_ref().unwrap(), @@ -371,9 +359,8 @@ impl Build { &self.target, self.profile, step, - log, )?; - info!(&log, "wasm bindings were built at {:#?}.", &self.out_dir); + info!("wasm bindings were built at {:#?}.", &self.out_dir); Ok(()) } } diff --git a/src/command/login.rs b/src/command/login.rs index a660cb9e..0ee09c3d 100644 --- a/src/command/login.rs +++ b/src/command/login.rs @@ -1,5 +1,5 @@ +use log::info; use npm; -use slog::Logger; use std::result; use PBAR; @@ -8,22 +8,17 @@ pub fn login( scope: Option, always_auth: bool, auth_type: Option, - log: &Logger, ) -> result::Result<(), failure::Error> { let registry = registry.unwrap_or(npm::DEFAULT_NPM_REGISTRY.to_string()); - info!(&log, "Logging in to npm..."); + info!("Logging in to npm..."); info!( - &log, "Scope: {:?} Registry: {}, Always Auth: {}, Auth Type: {:?}.", - &scope, - ®istry, - always_auth, - &auth_type + &scope, ®istry, always_auth, &auth_type ); - info!(&log, "npm info located in the npm debug log"); - npm::npm_login(log, ®istry, &scope, always_auth, &auth_type)?; - info!(&log, "Logged you in!"); + info!("npm info located in the npm debug log"); + npm::npm_login(®istry, &scope, always_auth, &auth_type)?; + info!("Logged you in!"); PBAR.message(&format!("👋 logged you in!")); Ok(()) diff --git a/src/command/mod.rs b/src/command/mod.rs index 06353ec1..86a8235b 100644 --- a/src/command/mod.rs +++ b/src/command/mod.rs @@ -14,7 +14,7 @@ use self::pack::pack; use self::publish::{access::Access, publish}; use self::test::{Test, TestOptions}; use failure::Error; -use slog::Logger; +use log::info; use std::path::PathBuf; use std::result; @@ -87,27 +87,27 @@ pub enum Command { } /// Run a command with the given logger! -pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error> { +pub fn run_wasm_pack(command: Command) -> result::Result<(), Error> { // Run the correct command based off input and store the result of it so that we can clear // the progress bar then return it let status = match command { Command::Build(build_opts) => { - info!(&log, "Running build command..."); - Build::try_from_opts(build_opts).and_then(|mut b| b.run(&log)) + info!("Running build command..."); + Build::try_from_opts(build_opts).and_then(|mut b| b.run()) } Command::Pack { path } => { - info!(&log, "Running pack command..."); - info!(&log, "Path: {:?}", &path); - pack(path, &log) + info!("Running pack command..."); + info!("Path: {:?}", &path); + pack(path) } Command::Publish { target, path, access, } => { - info!(&log, "Running publish command..."); - info!(&log, "Path: {:?}", &path); - publish(target, path, access, &log) + info!("Running publish command..."); + info!("Path: {:?}", &path); + publish(target, path, access) } Command::Login { registry, @@ -115,20 +115,16 @@ pub fn run_wasm_pack(command: Command, log: &Logger) -> result::Result<(), Error always_auth, auth_type, } => { - info!(&log, "Running login command..."); + info!("Running login command..."); info!( - &log, "Registry: {:?}, Scope: {:?}, Always Auth: {}, Auth Type: {:?}", - ®istry, - &scope, - &always_auth, - &auth_type + ®istry, &scope, &always_auth, &auth_type ); - login(registry, scope, always_auth, auth_type, &log) + login(registry, scope, always_auth, auth_type) } Command::Test(test_opts) => { - info!(&log, "Running test command..."); - Test::try_from_opts(test_opts).and_then(|t| t.run(&log)) + info!("Running test command..."); + Test::try_from_opts(test_opts).and_then(|t| t.run()) } }; diff --git a/src/command/pack.rs b/src/command/pack.rs index d9f70550..5ede6024 100644 --- a/src/command/pack.rs +++ b/src/command/pack.rs @@ -1,17 +1,17 @@ use command::utils::{find_pkg_directory, set_crate_path}; use failure::Error; +use log::info; use npm; -use slog::Logger; use std::path::PathBuf; use std::result; use PBAR; /// Executes the 'npm pack' command on the 'pkg' directory /// which creates a tarball that can be published to the NPM registry -pub fn pack(path: Option, log: &Logger) -> result::Result<(), Error> { +pub fn pack(path: Option) -> result::Result<(), Error> { let crate_path = set_crate_path(path)?; - info!(&log, "Packing up the npm package..."); + info!("Packing up the npm package..."); let pkg_directory = find_pkg_directory(&crate_path).ok_or_else(|| { format_err!( "Unable to find the pkg directory at path {:#?}, or in a child directory of {:#?}", @@ -19,12 +19,8 @@ pub fn pack(path: Option, log: &Logger) -> result::Result<(), Error> { &crate_path ) })?; - npm::npm_pack(log, &pkg_directory.to_string_lossy())?; - info!( - &log, - "Your package is located at {:#?}", - crate_path.join("pkg") - ); + npm::npm_pack(&pkg_directory.to_string_lossy())?; + info!("Your package is located at {:#?}", crate_path.join("pkg")); PBAR.message("🎒 packed up your package!"); Ok(()) diff --git a/src/command/publish/mod.rs b/src/command/publish/mod.rs index b2c0916d..568104b4 100644 --- a/src/command/publish/mod.rs +++ b/src/command/publish/mod.rs @@ -6,8 +6,8 @@ use command::build::{Build, BuildOptions}; use command::utils::{find_pkg_directory, set_crate_path}; use dialoguer::{Confirmation, Input, Select}; use failure::Error; +use log::info; use npm; -use slog::Logger; use std::path::PathBuf; use std::result; use PBAR; @@ -18,12 +18,11 @@ pub fn publish( _target: String, path: Option, access: Option, - log: &Logger, ) -> result::Result<(), Error> { let crate_path = set_crate_path(path)?; - info!(&log, "Publishing the npm package..."); - info!(&log, "npm info located in the npm debug log"); + info!("Publishing the npm package..."); + info!("npm info located in the npm debug log"); let pkg_directory = match find_pkg_directory(&crate_path) { Some(path) => Ok(path), @@ -53,7 +52,7 @@ pub fn publish( ..Default::default() }; Build::try_from_opts(build_opts) - .and_then(|mut build| build.run(&log)) + .and_then(|mut build| build.run()) .map(|()| crate_path.join(out_dir)) .map_err(|_| { format_err!( @@ -73,8 +72,8 @@ pub fn publish( } } }?; - npm::npm_publish(log, &pkg_directory.to_string_lossy(), access)?; - info!(&log, "Published your package!"); + npm::npm_publish(&pkg_directory.to_string_lossy(), access)?; + info!("Published your package!"); PBAR.message("💥 published your package!"); Ok(()) diff --git a/src/command/test.rs b/src/command/test.rs index 81e5c2b5..99c95e2d 100644 --- a/src/command/test.rs +++ b/src/command/test.rs @@ -9,9 +9,9 @@ use emoji; use failure::Error; use indicatif::HumanDuration; use lockfile::Lockfile; +use log::info; use manifest; use progressbar::Step; -use slog::Logger; use std::path::PathBuf; use std::time::Instant; use test::{self, webdriver}; @@ -97,7 +97,7 @@ pub struct Test { test_runner_path: Option, } -type TestStep = fn(&mut Test, &Step, &Logger) -> Result<(), Error>; +type TestStep = fn(&mut Test, &Step) -> Result<(), Error>; impl Test { /// Construct a test command from the given options. @@ -155,17 +155,17 @@ impl Test { } /// Execute this test command. - pub fn run(mut self, log: &Logger) -> Result<(), Error> { + pub fn run(mut self) -> Result<(), Error> { let process_steps = self.get_process_steps(); let mut step_counter = Step::new(process_steps.len()); let started = Instant::now(); for (_, process_step) in process_steps { - process_step(&mut self, &step_counter, log)?; + process_step(&mut self, &step_counter)?; step_counter.inc(); } let duration = HumanDuration(started.elapsed()); - info!(&log, "Done in {}.", &duration); + info!("Done in {}.", &duration); Ok(()) } @@ -225,34 +225,34 @@ impl Test { } } - fn step_check_rustc_version(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(log, "Checking rustc version..."); + fn step_check_rustc_version(&mut self, step: &Step) -> Result<(), Error> { + info!("Checking rustc version..."); let _ = build::check_rustc_version(step)?; - info!(log, "Rustc version is correct."); + info!("Rustc version is correct."); Ok(()) } - fn step_add_wasm_target(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Adding wasm-target..."); - build::rustup_add_wasm_target(log, step)?; - info!(&log, "Adding wasm-target was successful."); + fn step_add_wasm_target(&mut self, step: &Step) -> Result<(), Error> { + info!("Adding wasm-target..."); + build::rustup_add_wasm_target(step)?; + info!("Adding wasm-target was successful."); Ok(()) } - fn step_build_tests(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(log, "Compiling tests to wasm..."); + fn step_build_tests(&mut self, step: &Step) -> Result<(), Error> { + info!("Compiling tests to wasm..."); let msg = format!("{}Compiling tests to WASM...", emoji::CYCLONE); PBAR.step(step, &msg); - build::cargo_build_wasm_tests(log, &self.crate_path, !self.release)?; + build::cargo_build_wasm_tests(&self.crate_path, !self.release)?; - info!(log, "Finished compiling tests to wasm."); + info!("Finished compiling tests to wasm."); Ok(()) } - fn step_install_wasm_bindgen(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { - info!(&log, "Identifying wasm-bindgen dependency..."); + fn step_install_wasm_bindgen(&mut self, step: &Step) -> Result<(), Error> { + info!("Identifying wasm-bindgen dependency..."); let lockfile = Lockfile::new(&self.crate_data)?; let bindgen_version = lockfile.require_wasm_bindgen()?; @@ -272,51 +272,45 @@ impl Test { let install_permitted = match self.mode { BuildMode::Normal => { - info!(&log, "Ensuring wasm-bindgen-cli is installed..."); + info!("Ensuring wasm-bindgen-cli is installed..."); true } BuildMode::Force => { - info!(&log, "Ensuring wasm-bindgen-cli is installed..."); + info!("Ensuring wasm-bindgen-cli is installed..."); true } BuildMode::Noinstall => { - info!(&log, "Searching for existing wasm-bindgen-cli install..."); + info!("Searching for existing wasm-bindgen-cli install..."); false } }; - let dl = bindgen::install_wasm_bindgen( - &self.cache, - &bindgen_version, - install_permitted, - step, - log, - )?; + let dl = + bindgen::install_wasm_bindgen(&self.cache, &bindgen_version, install_permitted, step)?; self.test_runner_path = Some(dl.binary("wasm-bindgen-test-runner")); - info!(&log, "Getting wasm-bindgen-cli was successful."); + info!("Getting wasm-bindgen-cli was successful."); Ok(()) } - fn step_test_node(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { + fn step_test_node(&mut self, step: &Step) -> Result<(), Error> { assert!(self.node); - info!(log, "Running tests in node..."); + info!("Running tests in node..."); PBAR.step(step, "Running tests in node..."); test::cargo_test_wasm( &self.crate_path, self.release, - log, Some(( "CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", &self.test_runner_path.as_ref().unwrap(), )), )?; - info!(log, "Finished running tests in node."); + info!("Finished running tests in node."); Ok(()) } - fn step_get_chromedriver(&mut self, step: &Step, _log: &Logger) -> Result<(), Error> { + fn step_get_chromedriver(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Getting chromedriver..."); assert!(self.chrome && self.chromedriver.is_none()); @@ -327,14 +321,14 @@ impl Test { Ok(()) } - fn step_test_chrome(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { + fn step_test_chrome(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Running tests in Chrome..."); let chromedriver = self.chromedriver.as_ref().unwrap().display().to_string(); let chromedriver = chromedriver.as_str(); info!( - log, - "Running tests in Chrome with chromedriver at {}", chromedriver + "Running tests in Chrome with chromedriver at {}", + chromedriver ); let test_runner = self @@ -344,7 +338,7 @@ impl Test { .display() .to_string(); let test_runner = test_runner.as_str(); - info!(log, "Using wasm-bindgen test runner at {}", test_runner); + info!("Using wasm-bindgen test runner at {}", test_runner); let mut envs = vec![ ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner), @@ -354,11 +348,11 @@ impl Test { envs.push(("NO_HEADLESS", "1")); } - test::cargo_test_wasm(&self.crate_path, self.release, log, envs)?; + test::cargo_test_wasm(&self.crate_path, self.release, envs)?; Ok(()) } - fn step_get_geckodriver(&mut self, step: &Step, _log: &Logger) -> Result<(), Error> { + fn step_get_geckodriver(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Getting geckodriver..."); assert!(self.firefox && self.geckodriver.is_none()); @@ -369,14 +363,14 @@ impl Test { Ok(()) } - fn step_test_firefox(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { + fn step_test_firefox(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Running tests in Firefox..."); let geckodriver = self.geckodriver.as_ref().unwrap().display().to_string(); let geckodriver = geckodriver.as_str(); info!( - log, - "Running tests in Firefox with geckodriver at {}", geckodriver + "Running tests in Firefox with geckodriver at {}", + geckodriver ); let test_runner = self @@ -386,7 +380,7 @@ impl Test { .display() .to_string(); let test_runner = test_runner.as_str(); - info!(log, "Using wasm-bindgen test runner at {}", test_runner); + info!("Using wasm-bindgen test runner at {}", test_runner); let mut envs = vec![ ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner), @@ -396,11 +390,11 @@ impl Test { envs.push(("NO_HEADLESS", "1")); } - test::cargo_test_wasm(&self.crate_path, self.release, log, envs)?; + test::cargo_test_wasm(&self.crate_path, self.release, envs)?; Ok(()) } - fn step_get_safaridriver(&mut self, step: &Step, _log: &Logger) -> Result<(), Error> { + fn step_get_safaridriver(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Getting safaridriver..."); assert!(self.safari && self.safaridriver.is_none()); @@ -408,14 +402,14 @@ impl Test { Ok(()) } - fn step_test_safari(&mut self, step: &Step, log: &Logger) -> Result<(), Error> { + fn step_test_safari(&mut self, step: &Step) -> Result<(), Error> { PBAR.step(step, "Running tests in Safari..."); let safaridriver = self.safaridriver.as_ref().unwrap().display().to_string(); let safaridriver = safaridriver.as_str(); info!( - log, - "Running tests in Safari with safaridriver at {}", safaridriver + "Running tests in Safari with safaridriver at {}", + safaridriver ); let test_runner = self @@ -425,7 +419,7 @@ impl Test { .display() .to_string(); let test_runner = test_runner.as_str(); - info!(log, "Using wasm-bindgen test runner at {}", test_runner); + info!("Using wasm-bindgen test runner at {}", test_runner); let mut envs = vec![ ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner), @@ -435,7 +429,7 @@ impl Test { envs.push(("NO_HEADLESS", "1")); } - test::cargo_test_wasm(&self.crate_path, self.release, log, envs)?; + test::cargo_test_wasm(&self.crate_path, self.release, envs)?; Ok(()) } } diff --git a/src/lib.rs b/src/lib.rs index 901e1a37..0f0e4a0e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,11 +20,8 @@ extern crate serde_ignored; extern crate serde_json; #[macro_use] extern crate structopt; -#[macro_use] -extern crate slog; extern crate dialoguer; -extern crate slog_async; -extern crate slog_term; +extern crate log; extern crate toml; extern crate walkdir; extern crate wasm_pack_binary_install; @@ -36,7 +33,6 @@ pub mod command; pub mod emoji; pub mod license; pub mod lockfile; -pub mod logger; pub mod manifest; pub mod npm; pub mod progressbar; diff --git a/src/logger.rs b/src/logger.rs deleted file mode 100644 index 08add5de..00000000 --- a/src/logger.rs +++ /dev/null @@ -1,76 +0,0 @@ -//! Logging facilities for `wasm-pack`. - -use command::Command; -use failure; -use slog::{Drain, Level, Logger}; -use slog_async::Async; -use slog_term::{FullFormat, PlainDecorator}; -use std::fs::OpenOptions; -use std::path::PathBuf; - -/// Create the logger for wasm-pack that will output any info warning or errors we encounter -pub fn new(cmd: &Command, verbosity: u8) -> Result { - let log_path = log_file_path(&cmd); - let file = OpenOptions::new() - .create(true) - .append(true) - .open(log_path)?; - - let decorator = PlainDecorator::new(file); - let drain = FullFormat::new(decorator).build().fuse(); - - // Set the log level based off the number of v passed in to the command line args. - // Level level means only messages of that level and higher are logged. If we have - // an error then we'll log it unconditionally, but extra levels are only available - // with extra v - let log_level = match verbosity { - 0 => Level::Error, - 1 => Level::Info, - 2 => Level::Debug, - _ => Level::Trace, - }; - let drain = Async::new(drain).build().filter_level(log_level).fuse(); - Ok(Logger::root(drain, o!())) -} - -/// Figure out where to stick the log based off the command arguments given -fn log_file_path(cmd: &Command) -> PathBuf { - let path = match cmd { - Command::Build(build_opts) => &build_opts.path, - Command::Pack { path } => path, - Command::Publish { - target: _, - path, - access: _, - } => path, - Command::Test(test_opts) => &test_opts.path, - Command::Login { .. } => &None, - }; - - // If the path exists attempt to use it, if not default to the current directory - if let Some(ref path) = path { - let mut path_buf = PathBuf::from(path); - path_buf.push("Cargo.toml"); - - // If the manifest file exists put the log in that directory otherwise default - // to the current directory. - if path_buf.exists() { - path_buf.pop(); - path_buf.push("wasm-pack.log"); - path_buf - } else { - let mut path_buf = this_dir(); - path_buf.push("wasm-pack.log"); - path_buf - } - } else { - let mut path_buf = this_dir(); - path_buf.push("wasm-pack.log"); - path_buf - } -} - -/// Return a `PathBuf` for the current directory -fn this_dir() -> PathBuf { - PathBuf::from(".") -} diff --git a/src/main.rs b/src/main.rs index 0af82966..26698a28 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ extern crate atty; +extern crate env_logger; #[macro_use] extern crate failure; #[macro_use] @@ -9,11 +10,12 @@ extern crate which; use std::env; use structopt::StructOpt; -use wasm_pack::{command::run_wasm_pack, logger, Cli}; +use wasm_pack::{command::run_wasm_pack, Cli}; mod installer; fn main() { + env_logger::init(); setup_panic!(); if let Err(e) = run() { eprintln!("Error: {}", e); @@ -39,7 +41,6 @@ fn run() -> Result<(), failure::Error> { } let args = Cli::from_args(); - let log = logger::new(&args.cmd, args.verbosity)?; - run_wasm_pack(args.cmd, &log)?; + run_wasm_pack(args.cmd)?; Ok(()) } diff --git a/src/npm.rs b/src/npm.rs index 74a02508..d99732fd 100644 --- a/src/npm.rs +++ b/src/npm.rs @@ -3,21 +3,21 @@ use child; use command::publish::access::Access; use failure::{self, ResultExt}; -use slog::Logger; +use log::info; /// The default npm registry used when we aren't working with a custom registry. pub const DEFAULT_NPM_REGISTRY: &'static str = "https://registry.npmjs.org/"; /// Run the `npm pack` command. -pub fn npm_pack(log: &Logger, path: &str) -> Result<(), failure::Error> { +pub fn npm_pack(path: &str) -> Result<(), failure::Error> { let mut cmd = child::new_command("npm"); cmd.current_dir(path).arg("pack"); - child::run(log, cmd, "npm pack").context("Packaging up your code failed")?; + child::run(cmd, "npm pack").context("Packaging up your code failed")?; Ok(()) } /// Run the `npm publish` command. -pub fn npm_publish(log: &Logger, path: &str, access: Option) -> Result<(), failure::Error> { +pub fn npm_publish(path: &str, access: Option) -> Result<(), failure::Error> { let mut cmd = child::new_command("npm"); match access { Some(a) => cmd @@ -27,13 +27,12 @@ pub fn npm_publish(log: &Logger, path: &str, access: Option) -> Result<( None => cmd.current_dir(path).arg("publish"), }; - child::run(log, cmd, "npm publish").context("Publishing to npm failed")?; + child::run(cmd, "npm publish").context("Publishing to npm failed")?; Ok(()) } /// Run the `npm login` command. pub fn npm_login( - log: &Logger, registry: &String, scope: &Option, always_auth: bool, @@ -58,7 +57,7 @@ pub fn npm_login( let mut cmd = child::new_command("npm"); cmd.args(args); - info!(log, "Running {:?}", cmd); + info!("Running {:?}", cmd); match cmd.status()?.success() { true => Ok(()), false => bail!("Login to registry {} failed", registry), diff --git a/src/test/mod.rs b/src/test/mod.rs index 1b71fed8..0ec11e95 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -4,19 +4,14 @@ pub mod webdriver; use child; use failure::{self, ResultExt}; -use slog::Logger; +use log::info; use std::ffi::OsStr; use std::path::Path; use std::process::Command; /// Run `cargo test` with the `nightly` toolchain and targeting /// `wasm32-unknown-unknown`. -pub fn cargo_test_wasm( - path: &Path, - release: bool, - log: &Logger, - envs: I, -) -> Result<(), failure::Error> +pub fn cargo_test_wasm(path: &Path, release: bool, envs: I) -> Result<(), failure::Error> where I: IntoIterator, K: AsRef, @@ -30,12 +25,11 @@ where cmd.arg("--release"); } cmd.arg("--target").arg("wasm32-unknown-unknown"); - child::run(log, cmd, "cargo test") - .context("Running Wasm tests with wasm-bindgen-test failed")? + child::run(cmd, "cargo test").context("Running Wasm tests with wasm-bindgen-test failed")? }; for line in output.lines() { - info!(log, "test output: {}", line); + info!("test output: {}", line); println!("{}", line); } Ok(()) diff --git a/tests/all/main.rs b/tests/all/main.rs index 572d6554..61875e07 100644 --- a/tests/all/main.rs +++ b/tests/all/main.rs @@ -4,8 +4,6 @@ extern crate lazy_static; #[macro_use] extern crate serde_derive; extern crate serde_json; -#[macro_use] -extern crate slog; extern crate structopt; extern crate tempfile; extern crate wasm_pack; diff --git a/tests/all/utils/fixture.rs b/tests/all/utils/fixture.rs index 05968739..2ed126e6 100644 --- a/tests/all/utils/fixture.rs +++ b/tests/all/utils/fixture.rs @@ -1,4 +1,3 @@ -use super::logger::null_logger; use std::env; use std::fs; use std::mem::ManuallyDrop; @@ -170,7 +169,6 @@ impl Fixture { static INSTALL_WASM_BINDGEN: Once = ONCE_INIT; let cache = self.cache(); let version = "0.2.21"; - let log = &null_logger(); let download = || { if let Ok(download) = @@ -179,7 +177,7 @@ impl Fixture { return Ok(download); } - wasm_pack::bindgen::cargo_install_wasm_bindgen(log, &cache, version, true) + wasm_pack::bindgen::cargo_install_wasm_bindgen(&cache, version, true) }; // Only one thread can perform the actual download, and then afterwards @@ -243,18 +241,17 @@ impl Fixture { } pub fn run(&self, cmd: wasm_pack::command::Command) -> Result<(), failure::Error> { - let logger = wasm_pack::logger::new(&cmd, 3)?; match cmd { wasm_pack::command::Command::Test(cmd) => { let _lock = self.lock(); let mut test = wasm_pack::command::test::Test::try_from_opts(cmd)?; test.set_cache(self.cache()); - test.run(&logger) + test.run() } wasm_pack::command::Command::Build(cmd) => { let mut build = wasm_pack::command::build::Build::try_from_opts(cmd)?; build.set_cache(self.cache()); - build.run(&logger) + build.run() } _ => unreachable!(), } diff --git a/tests/all/utils/logger.rs b/tests/all/utils/logger.rs deleted file mode 100644 index 46cc0d7e..00000000 --- a/tests/all/utils/logger.rs +++ /dev/null @@ -1,6 +0,0 @@ -use slog::Logger; - -// Create a logger that ignores log messages for testing. -pub fn null_logger() -> Logger { - Logger::root(slog::Discard, o!()) -} diff --git a/tests/all/utils/mod.rs b/tests/all/utils/mod.rs index 655b80d8..8b4244fa 100644 --- a/tests/all/utils/mod.rs +++ b/tests/all/utils/mod.rs @@ -1,4 +1,3 @@ pub mod file; pub mod fixture; -pub mod logger; pub mod manifest; From 1e3de3006bc820274a527203b5182dcf4b79a8d2 Mon Sep 17 00:00:00 2001 From: Ashley Williams Date: Mon, 14 Jan 2019 19:04:05 -0500 Subject: [PATCH 04/16] doc(logs): document env_logger setup --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b145e061..53af817e 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,15 @@ This project requires Rust 1.30.0 or later. ## 📝 Logging -We generate a `wasm-pack.log` file if `wasm-pack` errors on you, and you can -customize the log verbosity using the verbosity flag. - -| Verbosity | Result | -| ------------- |-----------------------------------------------------| -| -v | All Info, Warn, and Errors are logged | -| -vv | All Debug, Info, Warn, and Errors are logged | -| -vvv | All Trace, Debug, Info, Warn, and Errors are logged | +`wasm-pack` uses [`env_logger`] to produces logs when `wasm-pack` runs. + +To configure your log level, use the `RUST_LOG` environment variable. For example: + +``` +RUST_LOG=info wasm-pack build +``` + +[`env_logger`]: https://crates.io/crates/env_logger ## 👯 Contributing From b2d75ecf0c87f824db2344d80b4bc88b9d5080b7 Mon Sep 17 00:00:00 2001 From: Ashley Williams Date: Mon, 14 Jan 2019 19:27:15 -0500 Subject: [PATCH 05/16] feat(test): remove windows output fmting test --- tests/all/build.rs | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tests/all/build.rs b/tests/all/build.rs index 7d06f158..cc21fbb5 100644 --- a/tests/all/build.rs +++ b/tests/all/build.rs @@ -228,23 +228,3 @@ fn build_with_and_without_wasm_bindgen_debug() { ); } } - -#[cfg(target_os = "windows")] -#[test] -fn it_format_out_dir_on_windows() { - let fixture = utils::fixture::js_hello_world(); - fixture.install_local_wasm_bindgen(); - let cli = Cli::from_iter_safe(vec![ - "wasm-pack", - "build", - &fixture.path.display().to_string(), - ]) - .unwrap(); - fixture.run(cli.cmd).unwrap(); - - let wasm_pack_log = utils::file::read_file(&fixture.path.join("wasm-pack.log")).unwrap(); - assert!( - wasm_pack_log.contains(r"Your wasm pkg is ready to publish at C:\"), - "directories in wasm-pack.log should be well formatted", - ); -} From 3c67711dc5d079af3a3dce1fc212ea8b89aecc77 Mon Sep 17 00:00:00 2001 From: Ashley Williams Date: Fri, 11 Jan 2019 12:13:45 -0500 Subject: [PATCH 06/16] v0.6.0 --- CHANGELOG.md | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++ Cargo.lock | 106 ++++++++--------- Cargo.toml | 4 +- 3 files changed, 374 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b939435..4bf030ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,324 @@ # Changelog +## 🌅 0.6.0 + +- ### ✨ Features + + - **Add three build profiles and infrastructure for their toml config - [fitzgen], [issue/153] [issue/160] [pull/440]** + + When originally conceived, `wasm-pack` was exclusively a packaging and publishing tool, which naively assumed + that the crate author would simply run `wasm-pack` when they were ready to publish a wasm package. As a result, + `wasm-pack` always ran `cargo build` in `--release` mode. Since then, `wasm-pack` has grown into an integrated build + tool used at all stages of development, from idea conception to publishing, and as such has developed new needs. + + In previous releases, we've supported a flag called `--debug` which will run `cargo build` in `dev` mode, which + trades faster compilation speed for a lack of optimizations. We've renamed this flag to `--dev` to match `cargo` + and added an additional flag, representing a third, intermediary, build profile, called `--profiling` which + is useful for investigating performance issues. You can see all three flags and their uses in the table below: + + | Profile | Debug Assertions | Debug Info | Optimizations | Notes | + |---------------|------------------|------------|---------------|---------------------------------------| + | `--dev` | Yes | Yes | No | Useful for development and debugging. | + | `--profiling` | No | Yes | Yes | Useful when profiling and investigating performance issues. | + | `--release` | No | No | Yes | Useful for shipping to production. | + + The meaning of these flags will evolve as the platform grows, and always be tied to the behavior of these flags + in `cargo`. You can learn more about these in the [`cargo profile` documentation]. + + This PR also introduces a way to configure `wasm-pack` in your `Cargo.toml` file that we intend to use much more + in the future. As a largely convention-based tool, `wasm-pack` will never require that you configure it manually, + however, as our community and their projects mature alongside the tool, it became clear that allowing folks the + ability to drop down and configure things was something we needed to do to meet their needs. + + Currently, you can only configure things related to the above-mentioned build profiles. To learn more, + [check out the documentation][profile-config-docs]. It leverages the `package.metadata.wasm-pack` key in your + `Carol.toml`, and looks like this: + + ```toml + # Cargo.toml + + [package.metadata.wasm-pack.profile.dev.wasm-bindgen] + # Should we enable wasm-bindgen's debug assertions in its generated JS glue? + debug-js-glue = true + # Should wasm-bindgen demangle the symbols in the "name" custom section? + demangle-name-section = true + # Should we emit the DWARF debug info custom sections? + dwarf-debug-info = false + ``` + + As always- there are defaults for you to use, but if you love to configure (or have a project that requires it), + get excited, as your options have grown now and will continue to! + + [profile-config-docs]: https://rustwasm.github.io/wasm-pack/book/cargo-toml-configuration.html + [`cargo profile` documentation]: https://doc.rust-lang.org/cargo/reference/manifest.html#the-profile-sections + [issue/153]: https://github.com/rustwasm/wasm-pack/issues/153 + [issue/160]: https://github.com/rustwasm/wasm-pack/issues/160 + [pull/440]: https://github.com/rustwasm/wasm-pack/pull/440 + + - **DEPRECATION: Rename `--debug` to `--dev` to match `cargo` - [fitzgen], [pull/439]** + + See the discussion of the build profiles feature above. This is a strict renaming of the previous `--debug` flag, + which will now warn as deprecated. + + [pull/439]: https://github.com/rustwasm/wasm-pack/pull/439 + + - **Pre-build before wasm-pack publish - [csmoe], [issue/438] [pull/444]** + + Previously, if you ran `wasm-pack publish` before you had successfully run `wasm-pack build`, + you'd receive an error that a package could not be found- because there would be no `pkg` or + out-directory containing a `package.json`. + + In this situation, you would hope that `wasm-pack` would build your package for you when you + ran `wasm-pack publish`. This is slightly complicated by the fact that not everyone wants to + build their package to the default target or to a directory named `pkg`. + + To solve this, running `wasm-pack publish` before a successful build will give you an interactive + prompt to build your package- allowing you to specify your out directory as well as the target you'd + like to build to. Check it out in the gif below: + + ![pre-build publish workflow](https://user-images.githubusercontent.com/35686186/50500909-5984fe80-0a8f-11e9-9de6-43d1423b2969.gif) + + [issue/438]: https://github.com/rustwasm/wasm-pack/issues/438 + [pull/444]: https://github.com/rustwasm/wasm-pack/pull/444 + + - **Generate self-.gitignore as part of pkg folder - [RReverser], [pull/453]** + + Since `wasm-pack` was first published, the `pkg` directory was intended to be treated as a + build artifact, and as such should never be published to version control. This was + never enforced by any assets generated by `wasm-pack`, however. + + Now, when building your package, `wasm-pack` will also generate a `.gitignore` file so that the + `pkg`, or out-directory, will be ignored. + + If you use another version control tool, you'll need to still create or edit your own ignore file- + pull requests to support other version control tools are welcome! + + If you require editing of the generated `package.json` or add additonal assets to your package + before publishing, you'll want to remove the `.gitignore` file and commit to version control. We + intend to have a solution that makes this workflow significantly easier in upcoming releases! + + [RReverser]: https://github.com/RReverser + [pull/453]: https://github.com/rustwasm/wasm-pack/pull/453 + + - **Support cargo workspaces - [fitzgen], [issue/252] [issue/305] [pull/430]** + + Workspaces are a well-liked and used feature of cargo that allow you to build multiple crates + in a single cargo project. Because of how `wasm-pack` handled paths for `target` and out-directories, + we did not support cargo workspaces out of the box. Now they should work well and the feature is + well guarded by tests! + + [issue/252]: https://github.com/rustwasm/wasm-pack/issues/252 + [issue/305]: https://github.com/rustwasm/wasm-pack/issues/305 + [pull/430]: https://github.com/rustwasm/wasm-pack/pull/430 + + - **Use a global cache for all downloaded binaries - [alexcrichton], [pull/426]** + + `wasm-pack` is an integrated build tool that orchestrates several other command line tools to build + your wasm project for you. How `wasm-pack` does this has evolved significantly since it's early versions. + In the last version, a `bin` directory was created to house the tool binaries that `wasm-pack` needed to + build our project, but this had several limitations. Firstly, it created a `bin` directory in your project's + root, which could be confusing. Secondly, it meant that sharing these tools across multiple projects was + not possible. We did this because it gaves us the fine-grained control over the version of these tools that + you used. + + Now, `wasm-pack` will not generate a `bin` directory, but rather will use a global cache. We retain the + fine-grained control over the versions of these tools that are used, but allow multiple projects that use + the same tools at the same versions to share the already installed asset. Your global cache will generally + be in your user's home directory- we use the [`dirs` crate] to determine where to place this global cache. + This is not currently customizable but is something we intend to look into doing! + + This feature ensures that `wasm-pack` users are downloading a minimal number of binaries from the network, + which, for `wasm-pack` users with multiple projects, should speed up build times. + + [`dirs` crate]: https://docs.rs/dirs/1.0.4/dirs/fn.cache_dir.html + [pull/426]: https://github.com/rustwasm/wasm-pack/pull/426 + +- ### 🤕 Fixes + + - **Fix `pack`, `login`, and `publish` for Windows users - [danwilhelm], [issue/277] [pull/489]** + + Rust's behavior for spawning processes on some Windows targets introduced an interesting case where + Rust would fail unless the command was explicitly spawned with a prepended `cmd /c`. This failure + of `wasm-pack` was well noticed by our community - and thanks to the efforts of `danwilhelm` is now + fixed! You can read more on the background of this issue in [rust-lang/rust issue/44542]. + + [rust-lang/rust issue/44542]: https://github.com/rust-lang/rust/pull/44542 + [issue/277]: https://github.com/rustwasm/wasm-pack/issues/277 + [pull/489]: https://github.com/rustwasm/wasm-pack/pull/489 + + - **Validate `--target` argument - [csmoe], [issue/483] [pull/484]** + + For a few releases now, `wasm-pack` has supported allowing users to specifying the target module system + they'd like their package built for- `browser`, `nodejs`, and `no-modules`. We did not however, validate + this input, and so if a user made even a slight mistake, e.g. `node`, `wasm-pack` would not catch the + error and would build your project using the default, `browser`. This is of course, surprising, and + unpleasant behavior and so now we'll error out with a message containing the supported target names. + + [issue/483]: https://github.com/rustwasm/wasm-pack/issues/483 + [pull/484]: https://github.com/rustwasm/wasm-pack/pull/484 + + - **Fix login - [danwilhelm], [issue/486] [pull/487]** + + [danwilhelm]: https://github.com/danwilhelm + [issue/486]: https://github.com/rustwasm/wasm-pack/issues/486 + [pull/487]: https://github.com/rustwasm/wasm-pack/pull/487 + + - **Eliminate unecessary escaping in build success terminal output - [huangjj27], [issue/390] [pull/396]** + + Previously, on some systems, a successful `wasm-pack build` would print a unfortunate looking string: + + ``` + | :-) Your wasm pkg is ready to publish at "\\\\?\\C:\\Users\\Ferris\\tmp\\wasm-bug\\pkg". + ``` + + We've updated this to make sure the path to your project is well-formed, and most importantly, + human-readable. + + [issue/390]: https://github.com/rustwasm/wasm-pack/issues/390 + [pull/396]: https://github.com/rustwasm/wasm-pack/pull/396 + + - **Copy license file(s) to out directory - [mstallmo], [issue/407] [pull/411]** + + Since `wasm-pack` was first published, we've copied over your `Cargo.toml` license definition over to + your `package.json`. However, we overlooked copying the actual `LICENSE` files over! Now we do! + + [issue/407]: https://github.com/rustwasm/wasm-pack/issues/407 + [pull/411]: https://github.com/rustwasm/wasm-pack/pull/411 + + - **Don't require cdylib crate-type for testing - [alexcrichton], [pull/442]** + + `wasm-pack` was unecssarily checking `Cargo.toml` for the `cdylib` crate type during calls to `wasm-pack test`. + The `cdylib` output isn't necessary for the `wasm-pack test` stage because `wasm-bindgen` isn't being run over + a wasm file during testing. This check is now removed! + + [pull/442]: https://github.com/rustwasm/wasm-pack/pull/442 + + - **Fix wasm-bindgen if lib is renamed via `lib.name` - [alexcrichton], [issue/339] [pull/435]** + + In some circumstances, a library author may wish to specify a `name` in the `[package]` portion of their + `Cargo.toml`, as well as a different `name` in the `[lib]` portion, e.g.: + + ```toml + [package] + name = "hello-wasm" + + [lib] + name = "wasm-lib" + ``` + + This would cause the `wasm-bindgen` build stage of `wasm-pack` to error out because `wasm-pack` would attempt + to run `wasm-bindgen-cli` on a path using the `[package]` name, which wouldn't exist (because it would be using + the `[lib]` name). Now it works- thanks to more usage of [`cargo_metadata`] in `wasm-pack` internals! + + [`cargo_metadata`]: https://crates.io/crates/cargo_metadata + [issue/339]: https://github.com/rustwasm/wasm-pack/issues/339 + [pull/435]: https://github.com/rustwasm/wasm-pack/pull/435 + + - **Print standard error only once for failing commands - [fitzgen], [issue/422] [pull/424]** + + Previously, `wasm-pack` may have printed `stderr` twice in some circumstances. This was both confusing and not + a pleasant experience, so now we've ensued that `wasm-pack` prints `stderr` exactly once! (It's hard enough to have + errors, you don't want `wasm-pack` rubbing it in, right?) + + [issue/422]: https://github.com/rustwasm/wasm-pack/issues/422 + [pull/424]: https://github.com/rustwasm/wasm-pack/pull/424 + + - **Add no-modules to --target flag's help text - [fitzgen], [issue/416] [pull/417]** + + This is an interesting one! `fitzgen` very reasonably filed an issue asking to add `wasm-bindgen`'s + `--target no-modules` feature to `wasm-pack`. This was confusing as this feature was indeed already implemented, + and documented- BUT, notably missing from the `wasm-pack --help` text. We've fixed that now- and it was an omission + so glaring we definitely considered it a bug! + + [issue/416]: https://github.com/rustwasm/wasm-pack/issues/416 + [pull/417]: https://github.com/rustwasm/wasm-pack/pull/417 + +- ### 🛠️ Maintenance + + - **Replace `slog` with `log` - [alexcrichton], [issue/425] [pull/434]** + + For internal maintenance reasons, as well as several end-user ones, we've migrated away from the `slog` family + of crates, and are now using the `log` crate plus `env_logger`. Now, `wasm-pack` won't create a `wasm-pack.log`. + Additionally, enabling logging will now be done through `RUST_LOG=wasm_pack` instead of `-v` flags. + + [issue/425]: https://github.com/rustwasm/wasm-pack/issues/425 + [pull/434]: https://github.com/rustwasm/wasm-pack/pull/434 + + - **Move binary installation to its own crate - [drager], [issue/384] [pull/415]** + + In `wasm-pack 0.5.0`, we move away from `cargo install`ing many of the tools that `wasm-pack` orchestrates. Because + we used `cargo install`, this required an end user to sit through the compilation of each tool, which was a + prohibitively long time. We moved, instead, to building, and then installing, binaries of the tools. This sped up + build times dramatically! + + This pattern has been very beneficial to `wasm-pack` and is potentially something that could be beneficial to other + projects! As a result, we've refactored it out into a crate and will be considering publishing it in the near future! + + [drager]: https://github.com/drager + [issue/384]: https://github.com/rustwasm/wasm-pack/issues/384 + [pull/415]: https://github.com/rustwasm/wasm-pack/pull/415 + + - **Replace internal `Error` with `failure::Error` - [alexcrichton], [pull/436]** + + The story of error message handling in `wasm-pack` has not been the prettiest. We originally were manually implementing + errors, adding the [`failure` crate] at one point, but not fully updating the entire codebase. With this PR, we are + nearly completely handling errors with `failure`, bringing the code into a much more maintainable and + pleasant-to-work-on place. + + [`failure` crate]: https://crates.io/crates/failure + [pull/436]: https://github.com/rustwasm/wasm-pack/pull/436 + + - **Update `mdbook` version used by Travis - [fitzgen], [pull/433]** + + [pull/433]: https://github.com/rustwasm/wasm-pack/pull/433 + + - **Read the `Cargo.toml` file only once - [fitzgen], [issue/25] [pull/431]** + + This is a very fun one since it fixes one of the original issues filed by `ag_dubs` at the very beginning of `wasm-pack` + development. In a rush to implement a POC tool, `ag_dubs` noted for posterity that the `Cargo.toml` was being read + mulitple times (twice), when it did not need to be. Thanks to `fitzgen` now it's read only once! A minor performance + improvement in the scheme of things, but a nice one :) + + [issue/25]: https://github.com/rustwasm/wasm-pack/issues/25 + [pull/431]: https://github.com/rustwasm/wasm-pack/pull/431 + + - **Use `name` field for Travis CI jobs - [fitzgen], [pull/432]** + + [pull/432]: https://github.com/rustwasm/wasm-pack/pull/432 + + - **Add a test for build command - [huangjj27], [pull/408]** + + [huangjj27]: https://github.com/huangjj27 + [pull/408]: https://github.com/rustwasm/wasm-pack/pull/408 + + - **Test paths on Windows - [xmclark], [issue/380] [pull/389]** + + [xmclark]: https://github.com/xmclark + [issue/380]: https://github.com/rustwasm/wasm-pack/issues/380 + [pull/389]: https://github.com/rustwasm/wasm-pack/pull/389 + + - **Fix typo in test function name for copying the README - [mstallmo], [pull/412]** + + [pull/412]: https://github.com/rustwasm/wasm-pack/pull/412 + +- ### 📖 Documentation + + - **Complete template deep dive docs - [danwilhem], [issue/345] [issue/346] [pull/490]** + + In a rush to publish a release, `ag_dubs` left some "Coming soon!" comments on most pages + of the "Template Deep Dive" docs. These docs help walk new users through the boilerplate + that using the `wasm-pack` template generates for you. Thanks so much to `danwilhem` for + picking this up and doing an excellent job! + + [issue/345]: https://github.com/rustwasm/wasm-pack/issues/345 + [issue/346]: https://github.com/rustwasm/wasm-pack/issues/346 + [pull/490]: https://github.com/rustwasm/wasm-pack/pull/490 + + - **Minor docs updates - [fitzgen], [issue/473] [pull/485]** + + [issue/473]: https://github.com/rustwasm/wasm-pack/issues/473 + [pull/485]: https://github.com/rustwasm/wasm-pack/pull/485 + ## 🌄 0.5.1 - ### 🤕 Fixes diff --git a/Cargo.lock b/Cargo.lock index 77ac158d..4cefa5ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -59,7 +59,7 @@ dependencies = [ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -70,7 +70,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -103,7 +103,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -112,7 +112,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -124,7 +124,7 @@ dependencies = [ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -158,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -169,7 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -189,7 +189,7 @@ dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -199,14 +199,14 @@ dependencies = [ [[package]] name = "console" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -242,7 +242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "curl-sys 0.4.16 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -256,7 +256,7 @@ version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -269,7 +269,7 @@ name = "dialoguer" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "console 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -279,7 +279,7 @@ name = "dirs" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -324,7 +324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -334,7 +334,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -344,7 +344,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -423,7 +423,7 @@ name = "indicatif" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "console 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -455,7 +455,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.46" +version = "0.2.47" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -474,7 +474,7 @@ version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -502,7 +502,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -512,7 +512,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -530,7 +530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -548,7 +548,7 @@ dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -571,7 +571,7 @@ version = "0.9.40" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -616,7 +616,7 @@ name = "parking_lot_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -628,7 +628,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -672,7 +672,7 @@ version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -682,7 +682,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -695,7 +695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -706,7 +706,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -762,7 +762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -936,7 +936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -976,7 +976,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1013,12 +1013,12 @@ dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.24" +version = "0.15.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1033,7 +1033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1043,7 +1043,7 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1063,7 +1063,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1075,7 +1075,7 @@ version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1103,7 +1103,7 @@ name = "termion" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1113,7 +1113,7 @@ name = "termios" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1137,7 +1137,7 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1224,7 +1224,7 @@ dependencies = [ [[package]] name = "wasm-pack" -version = "0.5.1" +version = "0.6.0" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1244,7 +1244,7 @@ dependencies = [ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1275,7 +1275,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1337,7 +1337,7 @@ name = "xattr" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1376,7 +1376,7 @@ dependencies = [ "checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" -"checksum console 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4ceeb6d030ed175896450ad583a39e67a77b8b2ab8802c2aae594112adc783a2" +"checksum console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ecc3753530b959618f617b0cd6494526008d98687f1af5d8f9fa83fa9cdbb594" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" @@ -1405,7 +1405,7 @@ dependencies = [ "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" -"checksum libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)" = "023a4cd09b2ff695f9734c1934145a315594b7986398496841c7031a5a1bbdbd" +"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476" "checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -1463,7 +1463,7 @@ dependencies = [ "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7" "checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b" "checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" -"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545" +"checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7" @@ -1472,7 +1472,7 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3" "checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04" -"checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c" +"checksum syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)" = "71b7693d9626935a362a3d1d4e59380800a919ebfa478d77a4f49e2a6d2c3ad5" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" diff --git a/Cargo.toml b/Cargo.toml index 69b21b37..55d4eaf0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wasm-pack" -description = "pack up the wasm and publish it to npm!" -version = "0.5.1" +description = "📦✨ your favorite rust -> wasm workflow tool!" +version = "0.6.0" authors = ["Ashley Williams "] repository = "https://github.com/ashleygwilliams/wasm-pack.git" license = "MIT/Apache-2.0" From ba8f6f64aafa0e10349737dba536ef014a388f5e Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sun, 20 Jan 2019 00:04:14 +0800 Subject: [PATCH 07/16] fix conflicts --- Cargo.lock | 145 +++++++++++++++---------------------------- src/bindgen.rs | 6 -- src/build.rs | 7 --- src/command/build.rs | 4 -- src/lib.rs | 3 - 5 files changed, 49 insertions(+), 116 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef249344..9bb1cda6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ name = "aho-corasick" version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -48,7 +48,7 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -56,7 +56,7 @@ name = "backtrace" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", @@ -71,8 +71,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -======= ] [[package]] @@ -88,7 +86,6 @@ dependencies = [ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "zip 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa ] [[package]] @@ -112,7 +109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.2.7" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -140,9 +137,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -217,7 +214,7 @@ dependencies = [ [[package]] name = "console" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -287,7 +284,7 @@ name = "dialoguer" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "console 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -340,9 +337,9 @@ name = "failure_derive" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -420,8 +417,8 @@ dependencies = [ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -431,22 +428,6 @@ dependencies = [ [[package]] name = "humantime" version = "1.2.0" -<<<<<<< HEAD -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "indicatif" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -======= source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -457,7 +438,7 @@ name = "indicatif" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "console 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -469,7 +450,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa ] [[package]] @@ -507,7 +487,7 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -541,12 +521,11 @@ dependencies = [ [[package]] name = "memchr" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -690,7 +669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "proc-macro2" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -706,7 +685,7 @@ name = "quote" version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -748,7 +727,7 @@ name = "rand" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -765,7 +744,7 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -866,7 +845,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -878,7 +857,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -959,7 +938,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -969,17 +948,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -987,17 +966,17 @@ name = "serde_ignored" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1054,17 +1033,17 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syn" -version = "0.15.25" +version = "0.15.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1074,9 +1053,9 @@ name = "synstructure" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1190,7 +1169,7 @@ name = "toml" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1245,11 +1224,6 @@ name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "void" version = "1.0.2" @@ -1285,10 +1259,10 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1299,23 +1273,6 @@ dependencies = [ ] [[package]] -<<<<<<< HEAD -name = "wasm-pack-binary-install" -version = "0.1.0" -dependencies = [ - "curl 0.4.19 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", - "zip 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -======= ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa name = "which" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1405,13 +1362,13 @@ dependencies = [ "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727" +"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6" "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" -"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d" +"checksum byteorder 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60f0b0d4c0a382d2734228fd12b5a6b5dac185c60e938026fd31b265b94f9bd2" "checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" "checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" "checksum cargo_metadata 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e5d1b4d380e1bab994591a24c2bdd1b054f64b60bef483a8c598c7c345bc3bbe" @@ -1422,7 +1379,7 @@ dependencies = [ "checksum clicolors-control 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "73abfd4c73d003a674ce5d2933fca6ce6c42480ea84a5ffe0a2dc39ed56300f9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" -"checksum console 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ecc3753530b959618f617b0cd6494526008d98687f1af5d8f9fa83fa9cdbb594" +"checksum console 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf3720d3f3fc30b721ef1ae54e13af3264af4af39dc476a8de56a6ee1e2184b" "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192" @@ -1447,10 +1404,7 @@ dependencies = [ "checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" "checksum indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a29b2fa6f00010c268bface64c18bb0310aaa70d46a195d5382d288c477fb016" -<<<<<<< HEAD -======= "checksum is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" @@ -1460,7 +1414,7 @@ dependencies = [ "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" -"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9" +"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" "checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" "checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c" "checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e" @@ -1477,7 +1431,7 @@ dependencies = [ "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" -"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" +"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" @@ -1510,10 +1464,10 @@ dependencies = [ "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7" -"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b" +"checksum serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "534b8b91a95e0f71bca3ed5824752d558da048d4248c91af873b63bd60519752" +"checksum serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)" = "a915306b0f1ac5607797697148c223bedeaa36bcc2e28a01441cd638cc6567b4" "checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" -"checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa" +"checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7" @@ -1522,7 +1476,7 @@ dependencies = [ "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum structopt 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "670ad348dc73012fcf78c71f06f9d942232cdd4c859d4b6975e27836c3efc0c3" "checksum structopt-derive 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ef98172b1a00b0bec738508d3726540edcbd186d50dfd326f2b1febbb3559f04" -"checksum syn 0.15.25 (registry+https://github.com/rust-lang/crates.io-index)" = "71b7693d9626935a362a3d1d4e59380800a919ebfa478d77a4f49e2a6d2c3ad5" +"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum tar 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" @@ -1545,7 +1499,6 @@ dependencies = [ "checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" "checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1" "checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" diff --git a/src/bindgen.rs b/src/bindgen.rs index 6f189e18..3bc2946d 100644 --- a/src/bindgen.rs +++ b/src/bindgen.rs @@ -9,10 +9,7 @@ use log::debug; use log::{info, warn}; use manifest::CrateData; use progressbar::Step; -<<<<<<< HEAD -======= use std::env; ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa use std::fs; use std::path::{Path, PathBuf}; use std::process::Command; @@ -146,8 +143,6 @@ pub fn cargo_install_wasm_bindgen( .arg(&tmp); child::run(cmd, "cargo install").context("Installing wasm-bindgen with cargo")?; -<<<<<<< HEAD -======= // `cargo install` will put the installed binaries in `$root/bin/*`, but we // just want them in `$root/*` directly (which matches how the tarballs are @@ -167,7 +162,6 @@ pub fn cargo_install_wasm_bindgen( ) })?; } ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa // Finally, move the `tmp` directory into our binary cache. fs::rename(&tmp, &destination)?; diff --git a/src/build.rs b/src/build.rs index 3c058de7..9e29c6d7 100644 --- a/src/build.rs +++ b/src/build.rs @@ -61,16 +61,12 @@ pub fn rustup_add_wasm_target(step: &Step) -> Result<(), Error> { } /// Run `cargo build` targetting `wasm32-unknown-unknown`. -<<<<<<< HEAD -pub fn cargo_build_wasm(path: &Path, profile: BuildProfile, step: &Step) -> Result<(), Error> { -======= pub fn cargo_build_wasm( path: &Path, profile: BuildProfile, step: &Step, extra_options: &Vec, ) -> Result<(), Error> { ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa let msg = format!("{}Compiling to WASM...", emoji::CYCLONE); PBAR.step(step, &msg); let mut cmd = Command::new("cargo"); @@ -93,10 +89,7 @@ pub fn cargo_build_wasm( } } cmd.arg("--target").arg("wasm32-unknown-unknown"); -<<<<<<< HEAD -======= cmd.args(extra_options); ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa child::run(cmd, "cargo build").context("Compiling your crate to WebAssembly failed")?; Ok(()) } diff --git a/src/command/build.rs b/src/command/build.rs index a2d450a1..c6bad240 100644 --- a/src/command/build.rs +++ b/src/command/build.rs @@ -289,11 +289,7 @@ impl Build { fn step_build_wasm(&mut self, step: &Step) -> Result<(), Error> { info!("Building wasm..."); -<<<<<<< HEAD - build::cargo_build_wasm(&self.crate_path, self.profile, step)?; -======= build::cargo_build_wasm(&self.crate_path, self.profile, step, &self.extra_options)?; ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa info!( "wasm built at {:#?}.", diff --git a/src/lib.rs b/src/lib.rs index 5b65ed6a..164988e1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,10 +20,7 @@ extern crate serde_ignored; extern crate serde_json; #[macro_use] extern crate structopt; -<<<<<<< HEAD -======= extern crate binary_install; ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa extern crate dialoguer; extern crate log; extern crate toml; From 5cc04cadfebb2f61904ad50917d70ff1af753f0a Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Fri, 25 Jan 2019 22:02:58 +0800 Subject: [PATCH 08/16] WIP: update wasm-bindgen-version --- tests/all/bindgen.rs | 4 ++-- tests/all/build.rs | 4 ++-- tests/all/lockfile.rs | 12 ++++++------ tests/all/test.rs | 10 +++++----- tests/all/utils/fixture.rs | 37 +++++++++++++++++-------------------- 5 files changed, 32 insertions(+), 35 deletions(-) diff --git a/tests/all/bindgen.rs b/tests/all/bindgen.rs index 3f044508..e2ef0441 100644 --- a/tests/all/bindgen.rs +++ b/tests/all/bindgen.rs @@ -11,7 +11,7 @@ use wasm_pack::bindgen; fn can_download_prebuilt_wasm_bindgen() { let dir = tempfile::TempDir::new().unwrap(); let cache = Cache::at(dir.path()); - let dl = bindgen::download_prebuilt_wasm_bindgen(&cache, "0.2.21", true).unwrap(); + let dl = bindgen::download_prebuilt_wasm_bindgen(&cache, "0.2.33", true).unwrap(); assert!(dl.binary("wasm-bindgen").unwrap().is_file()); assert!(dl.binary("wasm-bindgen-test-runner").unwrap().is_file()) } @@ -24,7 +24,7 @@ fn can_download_prebuilt_wasm_bindgen() { ))] fn downloading_prebuilt_wasm_bindgen_handles_http_errors() { let dir = tempfile::TempDir::new().unwrap(); - let bad_version = "0.2.21-some-trailing-version-stuff-that-does-not-exist"; + let bad_version = "0.2.33-some-trailing-version-stuff-that-does-not-exist"; let cache = Cache::at(dir.path()); let result = bindgen::download_prebuilt_wasm_bindgen(&cache, bad_version, true); assert!(result.is_err()); diff --git a/tests/all/build.rs b/tests/all/build.rs index be6e1912..e15b7736 100644 --- a/tests/all/build.rs +++ b/tests/all/build.rs @@ -47,7 +47,7 @@ fn it_should_build_crates_in_a_workspace() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" "#, ) .file( @@ -87,7 +87,7 @@ fn renamed_crate_name_works() { name = 'bar' [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" "#, ) .file( diff --git a/tests/all/lockfile.rs b/tests/all/lockfile.rs index 01876ba7..102025c2 100644 --- a/tests/all/lockfile.rs +++ b/tests/all/lockfile.rs @@ -8,7 +8,7 @@ fn it_gets_wasm_bindgen_version() { fixture.cargo_check(); let data = CrateData::new(&fixture.path).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.21"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); } #[test] @@ -17,7 +17,7 @@ fn it_gets_wasm_bindgen_test_version() { fixture.cargo_check(); let data = CrateData::new(&fixture.path).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_test_version(), Some("0.2.21"),); + assert_eq!(lock.wasm_bindgen_test_version(), Some("0.2.33"),); } #[test] @@ -46,7 +46,7 @@ fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "=0.2.33" "#, ) .file( @@ -62,7 +62,7 @@ fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() { fixture.cargo_check(); let data = CrateData::new(&fixture.path.join("blah")).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.21"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); } #[test] @@ -91,7 +91,7 @@ fn it_gets_wasm_bindgen_version_from_dependencies() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "=0.2.33" "#, ) .file( @@ -130,5 +130,5 @@ fn it_gets_wasm_bindgen_version_from_dependencies() { fixture.cargo_check(); let data = CrateData::new(&fixture.path.join("parent")).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.21"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); } diff --git a/tests/all/test.rs b/tests/all/test.rs index dbe9532e..cf4f870e 100644 --- a/tests/all/test.rs +++ b/tests/all/test.rs @@ -178,7 +178,7 @@ fn complains_about_missing_wasm_bindgen_test_dependency() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] # no wasm-bindgen-test dep here! @@ -218,10 +218,10 @@ fn renamed_crate_name_works() { name = 'bar' [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ) .file( @@ -258,10 +258,10 @@ fn cdylib_not_required() { authors = [] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ) .file( diff --git a/tests/all/utils/fixture.rs b/tests/all/utils/fixture.rs index e8cb0205..a61b7bf8 100644 --- a/tests/all/utils/fixture.rs +++ b/tests/all/utils/fixture.rs @@ -1,7 +1,4 @@ -<<<<<<< HEAD -======= use binary_install::Cache; ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa use std::env; use std::fs; use std::mem::ManuallyDrop; @@ -130,10 +127,10 @@ impl Fixture { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, name ), @@ -204,7 +201,7 @@ impl Fixture { pub fn install_local_wasm_bindgen(&self) -> PathBuf { static INSTALL_WASM_BINDGEN: Once = ONCE_INIT; let cache = self.cache(); - let version = "0.2.21"; + let version = "0.2.33"; let download = || { if let Ok(download) = @@ -354,10 +351,10 @@ pub fn no_cdylib() -> Fixture { # crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ); fixture @@ -406,14 +403,14 @@ pub fn wbg_test_diff_versions() -> Fixture { crate-type = ["cdylib", "rlib"] [dependencies] - # We depend on wasm-bindgen 0.2.21 - wasm-bindgen = "=0.2.21" + # We depend on the latest wasm-bindgen 0.2 + wasm-bindgen = "0.2" [dev-dependencies] - # And we depend on wasm-bindgen-test 0.2.19. This should still - # work, and we should end up with `wasm-bindgen` at 0.2.21 and - # wasm-bindgen-test at 0.2.19, and everything should still work. - wasm-bindgen-test = "0.2.19" + # And we depend on wasm-bindgen-test 0.2.29. This should still + # work, and we should end up with the latest `wasm-bindgen` and + # wasm-bindgen-test at 0.2.29, and everything should still work. + wasm-bindgen-test = "0.2.29" "#, ) .file( @@ -525,12 +522,12 @@ pub fn transitive_dependencies() -> Fixture { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" project_a = { path = "../project_a" } project_b = { path = "../project_b" } [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ); fixture.file( @@ -575,11 +572,11 @@ pub fn transitive_dependencies() -> Fixture { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" project_b = { path = "../project_b" } [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ); fixture.file( @@ -625,10 +622,10 @@ pub fn transitive_dependencies() -> Fixture { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.21" + wasm-bindgen = "0.2" [dev-dependencies] - wasm-bindgen-test = "=0.2.21" + wasm-bindgen-test = "0.2" "#, ); fixture.file( From 8d2465e5f40d30b5be79d03d8e604a1fa70aba91 Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 26 Jan 2019 18:11:12 +0800 Subject: [PATCH 09/16] bugfix(test-build): reuse cache I believe the older code has something wrong so it install wasm-bindgen from cargo, but now it can download the prebuilt version. fixes #447 --- tests/all/build.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/all/build.rs b/tests/all/build.rs index e15b7736..b843e4bc 100644 --- a/tests/all/build.rs +++ b/tests/all/build.rs @@ -2,6 +2,8 @@ use assert_cmd::prelude::*; use std::fs; use std::path::Path; use utils; +use wasm_pack::Cli; +use assert_cmd::prelude::*; #[test] fn build_in_non_crate_directory_doesnt_panic() { @@ -17,8 +19,11 @@ fn build_in_non_crate_directory_doesnt_panic() { #[test] fn it_should_build_js_hello_world_example() { let fixture = utils::fixture::js_hello_world(); - fixture.install_local_wasm_bindgen(); - fixture.wasm_pack().arg("build").assert().success(); + fixture + .wasm_pack() + .arg("build") + .assert() + .success(); } #[test] From 9be4e3c221136b204107ee42c296295da6793c88 Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 26 Jan 2019 18:13:14 +0800 Subject: [PATCH 10/16] cargo fmt --- tests/all/build.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/all/build.rs b/tests/all/build.rs index b843e4bc..5cb7c9ae 100644 --- a/tests/all/build.rs +++ b/tests/all/build.rs @@ -3,7 +3,6 @@ use std::fs; use std::path::Path; use utils; use wasm_pack::Cli; -use assert_cmd::prelude::*; #[test] fn build_in_non_crate_directory_doesnt_panic() { @@ -19,11 +18,7 @@ fn build_in_non_crate_directory_doesnt_panic() { #[test] fn it_should_build_js_hello_world_example() { let fixture = utils::fixture::js_hello_world(); - fixture - .wasm_pack() - .arg("build") - .assert() - .success(); + fixture.wasm_pack().arg("build").assert().success(); } #[test] From d10d6f9092c1e13e7a93a2ae83fe760f85de28e2 Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 26 Jan 2019 18:20:18 +0800 Subject: [PATCH 11/16] update lock --- Cargo.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0456bbb..7a977b16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,8 +344,8 @@ name = "escargot" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -362,8 +362,8 @@ name = "failure_derive" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -684,7 +684,7 @@ dependencies = [ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -696,7 +696,7 @@ dependencies = [ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -738,7 +738,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -751,10 +751,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quote" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1020,7 +1020,7 @@ name = "serde" version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1028,8 +1028,8 @@ name = "serde_derive" version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1058,7 +1058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smallvec" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1105,8 +1105,8 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1115,8 +1115,8 @@ name = "syn" version = "0.15.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1125,8 +1125,8 @@ name = "synstructure" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1338,8 +1338,8 @@ dependencies = [ "openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "predicates 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)", "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1519,9 +1519,9 @@ dependencies = [ "checksum predicates 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa984b7cd021a0bf5315bcce4c4ae61d2a535db2a8d288fc7578638690a7b7c3" "checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" "checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" -"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" +"checksum proc-macro2 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "38fddd23d98b2144d197c0eca5705632d4fe2667d14a6be5df8934f8d74f1978" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" +"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "dee497e66d8d76bf08ce20c8d36e16f93749ab0bf89975b4f8ae5cee660c2da2" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" @@ -1557,7 +1557,7 @@ dependencies = [ "checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db" +"checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" From 2717cecd9ddfd7ddb0098078a6b36045b817977e Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Mon, 28 Jan 2019 21:30:21 +0800 Subject: [PATCH 12/16] bugfix(changelog): finishing rebasement --- CHANGELOG.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9454a0db..7cf822ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,11 +32,7 @@ Currently, you can only configure things related to the above-mentioned build profiles. To learn more, [check out the documentation][profile-config-docs]. It leverages the `package.metadata.wasm-pack` key in your -<<<<<<< HEAD `Carol.toml`, and looks like this: -======= - `Cargo.toml`, and looks like this: ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa ```toml # Cargo.toml @@ -66,8 +62,6 @@ [pull/439]: https://github.com/rustwasm/wasm-pack/pull/439 -<<<<<<< HEAD -======= - **Add an option to pass an arbitrary set of arguments to `cargo build` - [torkve], [issue/455] [pull/461]** As an integrated build tool, `wasm-pack` orchestrates many secondary command line tools to build your package @@ -89,7 +83,6 @@ [pull/461]: https://github.com/rustwasm/wasm-pack/pull/461 ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa - **Pre-build before wasm-pack publish - [csmoe], [issue/438] [pull/444]** Previously, if you ran `wasm-pack publish` before you had successfully run `wasm-pack build`, @@ -280,14 +273,9 @@ build times dramatically! This pattern has been very beneficial to `wasm-pack` and is potentially something that could be beneficial to other -<<<<<<< HEAD - projects! As a result, we've refactored it out into a crate and will be considering publishing it in the near future! - -======= projects! As a result, we've refactored it out into a crate and have published it as it's own crate, [`binary-install`]. [`binary-install`]: https://crates.io/crates/binary-install ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa [drager]: https://github.com/drager [issue/384]: https://github.com/rustwasm/wasm-pack/issues/384 [pull/415]: https://github.com/rustwasm/wasm-pack/pull/415 @@ -310,11 +298,7 @@ This is a very fun one since it fixes one of the original issues filed by `ag_dubs` at the very beginning of `wasm-pack` development. In a rush to implement a POC tool, `ag_dubs` noted for posterity that the `Cargo.toml` was being read -<<<<<<< HEAD - mulitple times (twice), when it did not need to be. Thanks to `fitzgen` now it's read only once! A minor performance -======= multiple times (twice), when it did not need to be. Thanks to `fitzgen` now it's read only once! A minor performance ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa improvement in the scheme of things, but a nice one :) [issue/25]: https://github.com/rustwasm/wasm-pack/issues/25 @@ -341,11 +325,7 @@ - ### 📖 Documentation -<<<<<<< HEAD - - **Complete template deep dive docs - [danwilhem], [issue/345] [issue/346] [pull/490]** -======= - **Complete template deep dive docs - [danwilhelm], [issue/345] [issue/346] [pull/490]** ->>>>>>> dbc5a3655dbe15f6db472b21b83a9a1b7e60dffa In a rush to publish a release, `ag_dubs` left some "Coming soon!" comments on most pages of the "Template Deep Dive" docs. These docs help walk new users through the boilerplate From d56a94482bd4bf79f5a1f5d07b56579c5d2affa2 Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 23 Feb 2019 11:59:05 +0800 Subject: [PATCH 13/16] update version again --- tests/all/bindgen.rs | 4 ++-- tests/all/lockfile.rs | 12 ++++++------ tests/all/utils/fixture.rs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/all/bindgen.rs b/tests/all/bindgen.rs index e2ef0441..8e0174e4 100644 --- a/tests/all/bindgen.rs +++ b/tests/all/bindgen.rs @@ -11,7 +11,7 @@ use wasm_pack::bindgen; fn can_download_prebuilt_wasm_bindgen() { let dir = tempfile::TempDir::new().unwrap(); let cache = Cache::at(dir.path()); - let dl = bindgen::download_prebuilt_wasm_bindgen(&cache, "0.2.33", true).unwrap(); + let dl = bindgen::download_prebuilt_wasm_bindgen(&cache, "0.2.37", true).unwrap(); assert!(dl.binary("wasm-bindgen").unwrap().is_file()); assert!(dl.binary("wasm-bindgen-test-runner").unwrap().is_file()) } @@ -24,7 +24,7 @@ fn can_download_prebuilt_wasm_bindgen() { ))] fn downloading_prebuilt_wasm_bindgen_handles_http_errors() { let dir = tempfile::TempDir::new().unwrap(); - let bad_version = "0.2.33-some-trailing-version-stuff-that-does-not-exist"; + let bad_version = "0.2.37-some-trailing-version-stuff-that-does-not-exist"; let cache = Cache::at(dir.path()); let result = bindgen::download_prebuilt_wasm_bindgen(&cache, bad_version, true); assert!(result.is_err()); diff --git a/tests/all/lockfile.rs b/tests/all/lockfile.rs index 102025c2..87e4434e 100644 --- a/tests/all/lockfile.rs +++ b/tests/all/lockfile.rs @@ -8,7 +8,7 @@ fn it_gets_wasm_bindgen_version() { fixture.cargo_check(); let data = CrateData::new(&fixture.path).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),); } #[test] @@ -17,7 +17,7 @@ fn it_gets_wasm_bindgen_test_version() { fixture.cargo_check(); let data = CrateData::new(&fixture.path).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_test_version(), Some("0.2.33"),); + assert_eq!(lock.wasm_bindgen_test_version(), Some("0.2.37"),); } #[test] @@ -46,7 +46,7 @@ fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.33" + wasm-bindgen = "=0.2.37" "#, ) .file( @@ -62,7 +62,7 @@ fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() { fixture.cargo_check(); let data = CrateData::new(&fixture.path.join("blah")).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),); } #[test] @@ -91,7 +91,7 @@ fn it_gets_wasm_bindgen_version_from_dependencies() { crate-type = ["cdylib"] [dependencies] - wasm-bindgen = "=0.2.33" + wasm-bindgen = "=0.2.37" "#, ) .file( @@ -130,5 +130,5 @@ fn it_gets_wasm_bindgen_version_from_dependencies() { fixture.cargo_check(); let data = CrateData::new(&fixture.path.join("parent")).unwrap(); let lock = Lockfile::new(&data).unwrap(); - assert_eq!(lock.wasm_bindgen_version(), Some("0.2.33"),); + assert_eq!(lock.wasm_bindgen_version(), Some("0.2.37"),); } diff --git a/tests/all/utils/fixture.rs b/tests/all/utils/fixture.rs index a61b7bf8..04c47f31 100644 --- a/tests/all/utils/fixture.rs +++ b/tests/all/utils/fixture.rs @@ -201,7 +201,7 @@ impl Fixture { pub fn install_local_wasm_bindgen(&self) -> PathBuf { static INSTALL_WASM_BINDGEN: Once = ONCE_INIT; let cache = self.cache(); - let version = "0.2.33"; + let version = "0.2.37"; let download = || { if let Ok(download) = From dbd457132e85404705871672b470da7aa32a6cdf Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 23 Feb 2019 15:23:18 +0800 Subject: [PATCH 14/16] bugfix(tests/test): fix logic of test_output_is printed_once because the assert commaned seems to capture stdout in err string, work around the test faing by double the log counts --- tests/all/test.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/all/test.rs b/tests/all/test.rs index cf4f870e..04f12104 100644 --- a/tests/all/test.rs +++ b/tests/all/test.rs @@ -293,7 +293,7 @@ fn cdylib_not_required() { } #[test] -fn test_output_is_printed_once() { +fn test_output_is_printed_once_in_both_stdout_and_failures() { let fixture = fixture::Fixture::new(); fixture .readme() @@ -322,6 +322,9 @@ fn test_output_is_printed_once() { ) .install_local_wasm_bindgen(); let _lock = fixture.lock(); + + // there will be only one log in stdout, and only one log in failures + let log_cnt = 1; fixture .wasm_pack() .arg("test") @@ -329,6 +332,8 @@ fn test_output_is_printed_once() { .assert() .failure() .stderr(predicate::function(|err: &str| { - err.matches("YABBA DABBA DOO").count() == 1 + // but the err string will capture both stdout and failures, + // so we will get a log that count twice + err.matches("YABBA DABBA DOO").count() == log_cnt * 2 })); } From a31444496b399507cb3a907325efe14f4656b7f0 Mon Sep 17 00:00:00 2001 From: huangjj27 Date: Sat, 23 Feb 2019 15:27:04 +0800 Subject: [PATCH 15/16] remove unused import --- tests/all/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/all/build.rs b/tests/all/build.rs index 5cb7c9ae..a0361ae7 100644 --- a/tests/all/build.rs +++ b/tests/all/build.rs @@ -2,7 +2,6 @@ use assert_cmd::prelude::*; use std::fs; use std::path::Path; use utils; -use wasm_pack::Cli; #[test] fn build_in_non_crate_directory_doesnt_panic() { From 248ae672087031292af1eba3060357f25d5ee272 Mon Sep 17 00:00:00 2001 From: ashley williams Date: Tue, 26 Feb 2019 10:17:31 -0800 Subject: [PATCH 16/16] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf822ab..b5609370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ Currently, you can only configure things related to the above-mentioned build profiles. To learn more, [check out the documentation][profile-config-docs]. It leverages the `package.metadata.wasm-pack` key in your - `Carol.toml`, and looks like this: + `Cargo.toml`, and looks like this: ```toml # Cargo.toml