Update to Rust 2021

Cargo.toml

@@ -5,6 +5,7 @@ version = "0.10.3"
 authors = ["Ashley Williams <ashley666ashley@gmail.com>", "Jesper Håkansson <jesper@jesperh.se>"]
 repository = "https://github.com/rustwasm/wasm-pack.git"
 license = "MIT OR Apache-2.0"
+edition = "2021"
 readme = "README.md"
 categories = ["wasm"]
 documentation = "https://rustwasm.github.io/wasm-pack/"

src/bindgen.rs

@@ -1,10 +1,10 @@
 //! Functionality related to running `wasm-bindgen`.
 
+use crate::child;
+use crate::command::build::{BuildProfile, Target};
+use crate::install::{self, Tool};
+use crate::manifest::CrateData;
 use anyhow::{bail, Context, Result};
-use child;
-use command::build::{BuildProfile, Target};
-use install::{self, Tool};
-use manifest::CrateData;
 use semver;
 use std::path::Path;
 use std::process::Command;

src/build/mod.rs

@@ -1,14 +1,14 @@
 //! Building a Rust crate into a `.wasm` binary.
 
+use crate::child;
+use crate::command::build::BuildProfile;
+use crate::emoji;
+use crate::manifest::Crate;
+use crate::PBAR;
 use anyhow::{bail, Context, Result};
-use child;
-use command::build::BuildProfile;
-use emoji;
-use manifest::Crate;
 use std::path::Path;
 use std::process::Command;
 use std::str;
-use PBAR;
 
 pub mod wasm_target;
 

src/build/wasm_target.rs

@@ -1,13 +1,13 @@
 //! Checking for the wasm32 target
 
+use crate::child;
+use crate::emoji;
+use crate::PBAR;
 use anyhow::{anyhow, bail, Context, Result};
-use child;
-use emoji;
 use log::info;
 use std::fmt;
 use std::path::{Path, PathBuf};
 use std::process::Command;
-use PBAR;
 
 struct Wasm32Check {
     rustc_path: PathBuf,

src/child.rs

@@ -3,8 +3,8 @@
 //! This module helps us ensure that all child processes that we spawn get
 //! properly logged and their output is logged as well.
 
+use crate::install::Tool;
 use anyhow::{bail, Result};
-use install::Tool;
 use log::info;
 use std::process::{Command, Stdio};
 

src/command/build.rs

@@ -1,25 +1,25 @@
 //! Implementation of the `wasm-pack build` command.
 
+use crate::bindgen;
+use crate::build;
+use crate::cache;
+use crate::command::utils::{create_pkg_dir, get_crate_path};
+use crate::emoji;
+use crate::install::{self, InstallMode, Tool};
+use crate::license;
+use crate::lockfile::Lockfile;
+use crate::manifest;
+use crate::readme;
 use crate::wasm_opt;
+use crate::PBAR;
 use anyhow::{anyhow, bail, Error, Result};
 use binary_install::Cache;
-use bindgen;
-use build;
-use cache;
-use command::utils::{create_pkg_dir, get_crate_path};
-use emoji;
-use install::{self, InstallMode, Tool};
-use license;
-use lockfile::Lockfile;
 use log::info;
-use manifest;
-use readme;
 use std::fmt;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Instant;
 use structopt::clap::AppSettings;
-use PBAR;
 
 /// Everything required to configure and run the `wasm-pack build` command.
 #[allow(missing_docs)]

src/command/generate.rs

@@ -1,9 +1,9 @@
+use crate::cache;
+use crate::generate;
+use crate::install::{self, Tool};
+use crate::PBAR;
 use anyhow::Result;
-use cache;
-use generate;
-use install::{self, Tool};
 use log::info;
-use PBAR;
 
 /// Executes the 'cargo-generate' command in the current directory
 /// which generates a new rustwasm project from a template.

src/command/login.rs

@@ -1,7 +1,7 @@
+use crate::npm;
+use crate::PBAR;
 use anyhow::Result;
 use log::info;
-use npm;
-use PBAR;
 
 pub fn login(
     registry: Option<String>,

src/command/pack.rs

@@ -1,9 +1,9 @@
+use crate::command::utils::{find_pkg_directory, get_crate_path};
+use crate::npm;
+use crate::PBAR;
 use anyhow::{anyhow, Result};
-use command::utils::{find_pkg_directory, get_crate_path};
 use log::info;
-use npm;
 use std::path::PathBuf;
-use PBAR;
 
 /// Executes the 'npm pack' command on the 'pkg' directory
 /// which creates a tarball that can be published to the NPM registry

src/command/publish/mod.rs

@@ -2,15 +2,15 @@
 pub mod access;
 
 use self::access::Access;
+use crate::command::build::{Build, BuildOptions, Target};
+use crate::command::utils::{find_pkg_directory, get_crate_path};
+use crate::npm;
+use crate::PBAR;
 use anyhow::{anyhow, bail, Result};
-use command::build::{Build, BuildOptions, Target};
-use command::utils::{find_pkg_directory, get_crate_path};
 use dialoguer::{Confirm, Input, Select};
 use log::info;
-use npm;
 use std::path::PathBuf;
 use std::str::FromStr;
-use PBAR;
 
 /// Creates a tarball from a 'pkg' directory
 /// and publishes it to the NPM registry

src/command/test.rs

@@ -1,20 +1,20 @@
 //! Implementation of the `wasm-pack test` command.
 
+use crate::build;
+use crate::cache;
+use crate::command::utils::get_crate_path;
+use crate::install::{self, InstallMode, Tool};
+use crate::lockfile::Lockfile;
+use crate::manifest;
+use crate::test::{self, webdriver};
 use anyhow::{bail, Result};
 use binary_install::Cache;
-use build;
-use cache;
-use command::utils::get_crate_path;
 use console::style;
-use install::{self, InstallMode, Tool};
-use lockfile::Lockfile;
 use log::info;
-use manifest;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Instant;
 use structopt::clap::AppSettings;
-use test::{self, webdriver};
 
 #[derive(Debug, Default, StructOpt)]
 #[structopt(

src/generate.rs

@@ -1,9 +1,9 @@
 //! Functionality related to running `cargo-generate`.
 
+use crate::child;
+use crate::emoji;
+use crate::install::{self, Tool};
 use anyhow::{Context, Result};
-use child;
-use emoji;
-use install::{self, Tool};
 use std::process::Command;
 
 /// Run `cargo generate` in the current directory to create a new

src/install/krate.rs

@@ -1,5 +1,5 @@
+use crate::install::Tool;
 use anyhow::Result;
-use install::Tool;
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]

src/install/mod.rs

@@ -1,11 +1,12 @@
 //! Functionality related to installing prebuilt binaries and/or running cargo install.
 
 use self::krate::Krate;
+use crate::child;
+use crate::emoji;
+use crate::install;
+use crate::PBAR;
 use anyhow::{anyhow, bail, Context, Result};
 use binary_install::{Cache, Download};
-use child;
-use emoji;
-use install;
 use log::debug;
 use log::{info, warn};
 use std::env;
@@ -13,7 +14,6 @@ use std::fs;
 use std::path::Path;
 use std::process::Command;
 use which::which;
-use PBAR;
 
 mod arch;
 mod krate;

src/lib.rs

@@ -44,7 +44,7 @@ pub mod target;
 pub mod test;
 pub mod wasm_opt;
 
-use progressbar::{LogLevel, ProgressOutput};
+use crate::progressbar::{LogLevel, ProgressOutput};
 
 /// The global progress bar and user-facing message output.
 pub static PBAR: ProgressOutput = ProgressOutput::new();

src/license.rs

@@ -4,9 +4,9 @@ use anyhow::{anyhow, Result};
 use std::fs;
 use std::path::Path;
 
+use crate::manifest::CrateData;
+use crate::PBAR;
 use glob::glob;
-use manifest::CrateData;
-use PBAR;
 
 fn glob_license_files(path: &Path) -> Result<Vec<String>> {
     let mut license_files: Vec<String> = Vec::new();

src/lockfile.rs

@@ -5,9 +5,9 @@
 use std::fs;
 use std::path::PathBuf;
 
+use crate::manifest::CrateData;
 use anyhow::{anyhow, bail, Context, Result};
 use console::style;
-use manifest::CrateData;
 use toml;
 
 /// This struct represents the contents of `Cargo.lock`.

src/manifest/mod.rs

@@ -15,10 +15,11 @@ use std::{collections::HashMap, fs};
 use self::npm::{
     repository::Repository, CommonJSPackage, ESModulesPackage, NoModulesPackage, NpmPackage,
 };
+use crate::command::build::{BuildProfile, Target};
+use crate::PBAR;
 use cargo_metadata::Metadata;
 use chrono::offset;
 use chrono::DateTime;
-use command::build::{BuildProfile, Target};
 use curl::easy;
 use serde::{self, Deserialize};
 use serde_json;
@@ -27,7 +28,6 @@ use std::env;
 use std::io::Write;
 use strsim::levenshtein;
 use toml;
-use PBAR;
 
 const WASM_PACK_METADATA_KEY: &str = "package.metadata.wasm-pack";
 const WASM_PACK_VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION");

src/manifest/npm/commonjs.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use manifest::npm::repository::Repository;
+use crate::manifest::npm::repository::Repository;
 
 #[derive(Serialize)]
 pub struct CommonJSPackage {

src/manifest/npm/esmodules.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use manifest::npm::repository::Repository;
+use crate::manifest::npm::repository::Repository;
 
 #[derive(Serialize)]
 pub struct ESModulesPackage {

src/manifest/npm/nomodules.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use manifest::npm::repository::Repository;
+use crate::manifest::npm::repository::Repository;
 
 #[derive(Serialize)]
 pub struct NoModulesPackage {

src/npm.rs

@@ -1,8 +1,8 @@
 //! Functionality related to publishing to npm.
 
+use crate::child;
+use crate::command::publish::access::Access;
 use anyhow::{bail, Context, Result};
-use child;
-use command::publish::access::Access;
 use log::info;
 
 /// The default npm registry used when we aren't working with a custom registry.

src/progressbar.rs

@@ -1,8 +1,8 @@
 //! Fancy progress bar functionality.
 
+use crate::emoji;
 use anyhow::{bail, Error, Result};
 use console::style;
-use emoji;
 use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
 
 #[repr(u8)]

src/readme.rs

@@ -4,7 +4,7 @@ use anyhow::{Context, Result};
 use std::fs;
 use std::path::Path;
 
-use PBAR;
+use crate::PBAR;
 
 /// Copy the crate's README into the `pkg` directory.
 pub fn copy_from_crate(path: &Path, out_dir: &Path) -> Result<()> {

src/test/mod.rs

@@ -2,9 +2,9 @@
 
 pub mod webdriver;
 
+use crate::child;
 use crate::PBAR;
 use anyhow::{Context, Result};
-use child;
 use std::ffi::OsStr;
 use std::path::Path;
 use std::process::Command;

src/test/webdriver.rs

@@ -4,10 +4,10 @@ mod chromedriver;
 mod geckodriver;
 mod safaridriver;
 
+use crate::PBAR;
 use anyhow::Result;
 use binary_install::Cache;
 use std::path::PathBuf;
-use PBAR;
 
 pub use self::{
     chromedriver::{get_or_install_chromedriver, install_chromedriver},

src/test/webdriver/chromedriver.rs

@@ -1,11 +1,11 @@
 use super::{get_and_notify, Collector};
+use crate::install::InstallMode;
+use crate::stamps;
+use crate::target;
 use anyhow::{bail, Context, Result};
 use binary_install::Cache;
 use chrono::DateTime;
-use install::InstallMode;
-use stamps;
 use std::path::PathBuf;
-use target;
 
 // Keep it up to date with each `wasm-pack` release.
 // https://chromedriver.storage.googleapis.com/LATEST_RELEASE

src/test/webdriver/geckodriver.rs

@@ -1,11 +1,11 @@
 use super::{get_and_notify, Collector};
+use crate::install::InstallMode;
+use crate::stamps;
+use crate::target;
 use anyhow::{anyhow, bail, Context, Result};
 use binary_install::Cache;
 use chrono::DateTime;
-use install::InstallMode;
-use stamps;
 use std::path::PathBuf;
-use target;
 
 // Keep it up to date with each `wasm-pack` release.
 // https://github.com/mozilla/geckodriver/releases/latest

tests/all/build.rs

@@ -1,7 +1,7 @@
+use crate::utils;
 use assert_cmd::prelude::*;
 use std::fs;
 use std::path::Path;
-use utils;
 
 #[test]
 fn build_in_non_crate_directory_doesnt_panic() {

tests/all/generate.rs

@@ -1,5 +1,5 @@
+use crate::utils;
 use assert_cmd::prelude::*;
-use utils;
 
 #[test]
 fn new_with_no_name_errors() {

tests/all/license.rs

@@ -3,7 +3,7 @@ extern crate wasm_pack;
 
 use std::fs;
 
-use utils::{self, fixture};
+use crate::utils::{self, fixture};
 use wasm_pack::license;
 use wasm_pack::manifest::CrateData;
 

tests/all/lockfile.rs

@@ -1,4 +1,4 @@
-use utils::fixture;
+use crate::utils::fixture;
 use wasm_pack::lockfile::Lockfile;
 use wasm_pack::manifest::CrateData;
 

tests/all/log_level.rs

@@ -1,9 +1,9 @@
+use crate::utils;
 use assert_cmd::prelude::*;
 use predicates::boolean::PredicateBooleanExt;
 use predicates::prelude::predicate::str::contains;
 use predicates::reflection::PredicateReflection;
 use predicates::Predicate;
-use utils;
 
 fn matches_info() -> impl Predicate<str> + PredicateReflection {
     contains("[INFO]: Checking for the Wasm target...")

tests/all/manifest.rs

@@ -1,8 +1,8 @@
+use crate::utils::{self, fixture};
 use assert_cmd::prelude::*;
 use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::path::PathBuf;
-use utils::{self, fixture};
 use wasm_pack::command::build::Target;
 use wasm_pack::command::utils::get_crate_path;
 use wasm_pack::{self, license, manifest};

tests/all/readme.rs

@@ -3,7 +3,7 @@ extern crate wasm_pack;
 
 use std::fs;
 
-use utils::{self, fixture};
+use crate::utils::{self, fixture};
 use wasm_pack::readme;
 
 #[test]

tests/all/test.rs

@@ -1,7 +1,7 @@
+use crate::utils::fixture;
 use assert_cmd::prelude::*;
 use predicates::prelude::*;
 use std::env;
-use utils::fixture;
 
 #[test]
 fn it_can_run_node_tests() {

tests/all/wasm_opt.rs

@@ -1,6 +1,6 @@
+use crate::utils;
 use assert_cmd::prelude::*;
 use predicates::prelude::*;
-use utils;
 
 #[test]
 fn off_in_dev() {

tests/all/webdriver.rs

@@ -1,5 +1,5 @@
+use crate::utils::fixture;
 use binary_install::Cache;
-use utils::fixture;
 use wasm_pack::test::webdriver;
 
 #[test]