Skip to content

Commit

Permalink
Merge pull request #1873 from tottoto/update-to-edition-2021
Browse files Browse the repository at this point in the history
chore: update to edition 2021
  • Loading branch information
chriskrycho authored Aug 25, 2024
2 parents c690778 + e9c521d commit b22e843
Show file tree
Hide file tree
Showing 19 changed files with 12 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "2.0.1"
authors = ["David Herman <david.herman@gmail.com>", "Charles Pierce <cpierce.grad@gmail.com>"]
license = "BSD-2-Clause"
repository = "https://github.com/volta-cli/volta"
edition = "2018"
edition = "2021"

[features]
cross-platform-docs = ["volta-core/cross-platform-docs"]
Expand Down
4 changes: 2 additions & 2 deletions crates/archive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "archive"
version = "0.1.0"
authors = ["David Herman <david.herman@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
flate2 = "1.0"
Expand All @@ -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"] }
log = { version = "0.4", features = ["std"] }
2 changes: 1 addition & 1 deletion crates/fs-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "fs-utils"
version = "0.1.0"
authors = ["Michael Stewart <mikrostew@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
2 changes: 1 addition & 1 deletion crates/progress-read/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
name = "progress-read"
version = "0.1.0"
authors = ["David Herman <david.herman@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
2 changes: 1 addition & 1 deletion crates/test-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "test-support"
version = "0.1.0"
authors = ["David Herman <david.herman@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
hamcrest2 = "0.3.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/validate-npm-package-name/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "validate-npm-package-name"
version = "0.1.0"
authors = ["Chris Krycho <hello@chriskrycho.com>"]
edition = "2018"
edition = "2021"

[lib]

Expand Down
4 changes: 2 additions & 2 deletions crates/volta-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "volta-core"
version = "0.1.0"
authors = ["David Herman <david.herman@gmail.com>"]
edition = "2018"
edition = "2021"

[features]
mock-network = ["mockito"]
Expand Down Expand Up @@ -56,4 +56,4 @@ which = "6.0.3"

[target.'cfg(windows)'.dependencies]
winreg = "0.52.0"
junction = "1.1.0"
junction = "1.1.0"
1 change: 0 additions & 1 deletion crates/volta-core/src/hook/serial.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::{TryFrom, TryInto};
use std::marker::PhantomData;
use std::path::Path;

Expand Down
1 change: 0 additions & 1 deletion crates/volta-core/src/project/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/volta-core/src/toolchain/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::TryFrom;
use std::fs::write;

use crate::error::{Context, ErrorKind, Fallible};
Expand Down
1 change: 0 additions & 1 deletion crates/volta-core/src/toolchain/serial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion crates/volta-layout-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "volta-layout-macro"
version = "0.1.0"
authors = ["David Herman <david.herman@gmail.com>"]
edition = "2018"
edition = "2021"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion crates/volta-layout/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "volta-layout"
version = "0.1.1"
authors = ["Chuck Pierce <cpierce.grad@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
volta-layout-macro = { path = "../volta-layout-macro" }
2 changes: 1 addition & 1 deletion crates/volta-migrate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "volta-migrate"
version = "0.1.0"
authors = ["Charles Pierce <cpierce.grad@gmail.com>"]
edition = "2018"
edition = "2021"

[dependencies]
volta-core = { path = "../volta-core" }
Expand Down
1 change: 0 additions & 1 deletion crates/volta-migrate/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion crates/volta-migrate/src/v1.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::TryFrom;
#[cfg(unix)]
use std::fs::remove_file;
use std::fs::File;
Expand Down
1 change: 0 additions & 1 deletion crates/volta-migrate/src/v2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::TryFrom;
use std::fs::{read_to_string, write, File};
use std::io;
use std::path::{Path, PathBuf};
Expand Down
1 change: 0 additions & 1 deletion crates/volta-migrate/src/v3.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::TryFrom;
use std::fs::File;
use std::path::{Path, PathBuf};

Expand Down
1 change: 0 additions & 1 deletion crates/volta-migrate/src/v4.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use std::convert::TryFrom;
use std::fs::File;
use std::path::PathBuf;

Expand Down

0 comments on commit b22e843

Please sign in to comment.