diff --git a/Cargo.toml b/Cargo.toml index 1b12dd59b..485e20012 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "2.0.1" authors = ["David Herman ", "Charles Pierce "] license = "BSD-2-Clause" repository = "https://github.com/volta-cli/volta" -edition = "2018" +edition = "2021" [features] cross-platform-docs = ["volta-core/cross-platform-docs"] diff --git a/crates/archive/Cargo.toml b/crates/archive/Cargo.toml index 07e0de0ae..ee9aae932 100644 --- a/crates/archive/Cargo.toml +++ b/crates/archive/Cargo.toml @@ -2,7 +2,7 @@ name = "archive" version = "0.1.0" authors = ["David Herman "] -edition = "2018" +edition = "2021" [dependencies] flate2 = "1.0" @@ -20,4 +20,4 @@ cfg-if = "1.0" headers = "0.4" thiserror = "1.0.16" attohttpc = { version = "0.28", default-features = false, features = ["json", "compress", "tls-rustls-native-roots"] } -log = { version = "0.4", features = ["std"] } \ No newline at end of file +log = { version = "0.4", features = ["std"] } diff --git a/crates/fs-utils/Cargo.toml b/crates/fs-utils/Cargo.toml index cd341850c..9d2964429 100644 --- a/crates/fs-utils/Cargo.toml +++ b/crates/fs-utils/Cargo.toml @@ -2,6 +2,6 @@ name = "fs-utils" version = "0.1.0" authors = ["Michael Stewart "] -edition = "2018" +edition = "2021" [dependencies] diff --git a/crates/progress-read/Cargo.toml b/crates/progress-read/Cargo.toml index 3670381f0..6dafc1110 100644 --- a/crates/progress-read/Cargo.toml +++ b/crates/progress-read/Cargo.toml @@ -2,6 +2,6 @@ name = "progress-read" version = "0.1.0" authors = ["David Herman "] -edition = "2018" +edition = "2021" [dependencies] diff --git a/crates/test-support/Cargo.toml b/crates/test-support/Cargo.toml index 39f15d29a..57dc4b0e2 100644 --- a/crates/test-support/Cargo.toml +++ b/crates/test-support/Cargo.toml @@ -2,7 +2,7 @@ name = "test-support" version = "0.1.0" authors = ["David Herman "] -edition = "2018" +edition = "2021" [dependencies] hamcrest2 = "0.3.0" diff --git a/crates/validate-npm-package-name/Cargo.toml b/crates/validate-npm-package-name/Cargo.toml index 7813a0afa..0ad831b38 100644 --- a/crates/validate-npm-package-name/Cargo.toml +++ b/crates/validate-npm-package-name/Cargo.toml @@ -2,7 +2,7 @@ name = "validate-npm-package-name" version = "0.1.0" authors = ["Chris Krycho "] -edition = "2018" +edition = "2021" [lib] diff --git a/crates/volta-core/Cargo.toml b/crates/volta-core/Cargo.toml index 7e7f30a07..0a493228c 100644 --- a/crates/volta-core/Cargo.toml +++ b/crates/volta-core/Cargo.toml @@ -2,7 +2,7 @@ name = "volta-core" version = "0.1.0" authors = ["David Herman "] -edition = "2018" +edition = "2021" [features] mock-network = ["mockito"] @@ -56,4 +56,4 @@ which = "6.0.3" [target.'cfg(windows)'.dependencies] winreg = "0.52.0" -junction = "1.1.0" \ No newline at end of file +junction = "1.1.0" diff --git a/crates/volta-core/src/hook/serial.rs b/crates/volta-core/src/hook/serial.rs index 9a65d75a8..2ec54c15f 100644 --- a/crates/volta-core/src/hook/serial.rs +++ b/crates/volta-core/src/hook/serial.rs @@ -1,4 +1,3 @@ -use std::convert::{TryFrom, TryInto}; use std::marker::PhantomData; use std::path::Path; diff --git a/crates/volta-core/src/project/mod.rs b/crates/volta-core/src/project/mod.rs index 61c78d5a6..745739db0 100644 --- a/crates/volta-core/src/project/mod.rs +++ b/crates/volta-core/src/project/mod.rs @@ -1,7 +1,6 @@ //! Provides the `Project` type, which represents a Node project tree in //! the filesystem. -use std::convert::{TryFrom, TryInto}; use std::env; use std::ffi::OsStr; use std::iter::once; diff --git a/crates/volta-core/src/toolchain/mod.rs b/crates/volta-core/src/toolchain/mod.rs index a40f0cb3b..7270276ff 100644 --- a/crates/volta-core/src/toolchain/mod.rs +++ b/crates/volta-core/src/toolchain/mod.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::fs::write; use crate::error::{Context, ErrorKind, Fallible}; diff --git a/crates/volta-core/src/toolchain/serial.rs b/crates/volta-core/src/toolchain/serial.rs index b842f419c..da1e8ce98 100644 --- a/crates/volta-core/src/toolchain/serial.rs +++ b/crates/volta-core/src/toolchain/serial.rs @@ -3,7 +3,6 @@ use crate::platform::PlatformSpec; use crate::version::{option_version_serde, version_serde}; use node_semver::Version; use serde::{Deserialize, Serialize}; -use std::convert::TryFrom; #[derive(Serialize, Deserialize, Debug, PartialEq, Eq)] pub struct NodeVersion { diff --git a/crates/volta-layout-macro/Cargo.toml b/crates/volta-layout-macro/Cargo.toml index cb335b376..01196be1b 100644 --- a/crates/volta-layout-macro/Cargo.toml +++ b/crates/volta-layout-macro/Cargo.toml @@ -2,7 +2,7 @@ name = "volta-layout-macro" version = "0.1.0" authors = ["David Herman "] -edition = "2018" +edition = "2021" [lib] proc-macro = true diff --git a/crates/volta-layout/Cargo.toml b/crates/volta-layout/Cargo.toml index 139be5440..b45b1dbbe 100644 --- a/crates/volta-layout/Cargo.toml +++ b/crates/volta-layout/Cargo.toml @@ -2,7 +2,7 @@ name = "volta-layout" version = "0.1.1" authors = ["Chuck Pierce "] -edition = "2018" +edition = "2021" [dependencies] volta-layout-macro = { path = "../volta-layout-macro" } diff --git a/crates/volta-migrate/Cargo.toml b/crates/volta-migrate/Cargo.toml index 8da7ed14c..741795b51 100644 --- a/crates/volta-migrate/Cargo.toml +++ b/crates/volta-migrate/Cargo.toml @@ -2,7 +2,7 @@ name = "volta-migrate" version = "0.1.0" authors = ["Charles Pierce "] -edition = "2018" +edition = "2021" [dependencies] volta-core = { path = "../volta-core" } diff --git a/crates/volta-migrate/src/lib.rs b/crates/volta-migrate/src/lib.rs index bb6d3fee6..369aa0939 100644 --- a/crates/volta-migrate/src/lib.rs +++ b/crates/volta-migrate/src/lib.rs @@ -8,7 +8,6 @@ //! need to be aware that they may be partially applied (if something fails in the process) and should be //! able to re-start gracefully from an interrupted migration -use std::convert::TryInto; use std::path::Path; mod empty; diff --git a/crates/volta-migrate/src/v1.rs b/crates/volta-migrate/src/v1.rs index c631c84f5..0c8a6587c 100644 --- a/crates/volta-migrate/src/v1.rs +++ b/crates/volta-migrate/src/v1.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; #[cfg(unix)] use std::fs::remove_file; use std::fs::File; diff --git a/crates/volta-migrate/src/v2.rs b/crates/volta-migrate/src/v2.rs index 90293c81c..6a680127c 100644 --- a/crates/volta-migrate/src/v2.rs +++ b/crates/volta-migrate/src/v2.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::fs::{read_to_string, write, File}; use std::io; use std::path::{Path, PathBuf}; diff --git a/crates/volta-migrate/src/v3.rs b/crates/volta-migrate/src/v3.rs index 2e8d27ecc..ce45b7de5 100644 --- a/crates/volta-migrate/src/v3.rs +++ b/crates/volta-migrate/src/v3.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::fs::File; use std::path::{Path, PathBuf}; diff --git a/crates/volta-migrate/src/v4.rs b/crates/volta-migrate/src/v4.rs index 02f4701b7..8d82da50a 100644 --- a/crates/volta-migrate/src/v4.rs +++ b/crates/volta-migrate/src/v4.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::fs::File; use std::path::PathBuf;