Merge pull request #1616 from volta-cli/use-node-semver

Switch to stable node-semver crate

Author: chriskrycho

Cargo.lock

@@ -27,7 +27,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.96"
 lazy_static = "1.3.0"
 log = { version = "0.4", features = ["std"] }
-semver = { git = "https://github.com/mikrostew/semver", branch = "new-parser" }
+node-semver = "2"
 structopt = "0.2.14"
 cfg-if = "1.0"
 mockito = { version = "0.31.1", optional = true }

Cargo.toml

@@ -22,7 +22,7 @@ serde = { version = "1.0.174", features = ["derive"] }
 archive = { path = "../archive" }
 lazycell = "1.3.0"
 lazy_static = "1.3.0"
-semver = { git = "https://github.com/mikrostew/semver", branch = "new-parser" }
+node-semver = "2"
 cmdline_words_parser = "0.2.1"
 fs-utils = { path = "../fs-utils" }
 cfg-if = "1.0"

crates/volta-core/Cargo.toml

@@ -12,7 +12,7 @@ use cmdline_words_parser::parse_posix;
 use dunce::canonicalize;
 use lazy_static::lazy_static;
 use log::debug;
-use semver::Version;
+use node_semver::Version;
 
 const ARCH_TEMPLATE: &str = "{{arch}}";
 const OS_TEMPLATE: &str = "{{os}}";
@@ -182,14 +182,14 @@ fn execute_binary(bin: &str, base_path: &Path, extra_arg: Option<String>) -> Fal
 pub mod tests {
     use super::{calculate_extension, DistroHook, MetadataHook};
     use crate::tool::{NODE_DISTRO_ARCH, NODE_DISTRO_OS};
-    use semver::Version;
+    use node_semver::Version;
 
     #[test]
     fn test_distro_prefix_resolve() {
         let prefix = "http://localhost/node/distro/";
         let filename = "node.tar.gz";
         let hook = DistroHook::Prefix(prefix.to_string());
-        let version = Version::new(1, 0, 0);
+        let version = Version::parse("1.0.0").unwrap();
 
         assert_eq!(
             hook.resolve(&version, filename)
@@ -203,7 +203,7 @@ pub mod tests {
         let hook = DistroHook::Template(
             "http://localhost/node/{{os}}/{{arch}}/{{version}}/{{ext}}/{{filename}}".to_string(),
         );
-        let version = Version::new(1, 0, 0);
+        let version = Version::parse("1.0.0").unwrap();
 
         // tar.gz format has extra handling, to support a multi-part extension
         let expected = format!(

crates/volta-core/src/hook/tool.rs

@@ -11,7 +11,7 @@ use crate::layout::volta_home;
 use crate::tool::PackageConfig;
 use crate::version::parse_version;
 use log::debug;
-use semver::Version;
+use node_semver::Version;
 use walkdir::WalkDir;
 
 /// Checks if a given Node version image is available on the local machine