Merge pull request #916 from charlespierce/remove_lts_requirement

[Small] Remove now-unused 'LtsRequirement' tag

Author: charlespierce

crates/volta-core/src/tool/node/resolve.rs

@@ -44,7 +44,6 @@ pub fn resolve(matching: VersionSpec, session: &mut Session) -> Fallible<Version
         VersionSpec::Exact(version) => Ok(version),
         VersionSpec::None | VersionSpec::Tag(VersionTag::Lts) => resolve_lts(hooks),
         VersionSpec::Tag(VersionTag::Latest) => resolve_latest(hooks),
-        VersionSpec::Tag(VersionTag::LtsRequirement(req)) => resolve_lts_semver(req, hooks),
         // Node doesn't have "tagged" versions (apart from 'latest' and 'lts'), so custom tags will always be an error
         VersionSpec::Tag(VersionTag::Custom(tag)) => {
             Err(ErrorKind::NodeVersionNotFound { matching: tag }.into())
@@ -134,55 +133,6 @@ fn resolve_semver(matching: VersionReq, hooks: Option<&ToolHooks<Node>>) -> Fall
     }
 }
 
-fn resolve_lts_semver(matching: VersionReq, hooks: Option<&ToolHooks<Node>>) -> Fallible<Version> {
-    // ISSUE #34: also make sure this OS is available for this version
-    let url = match hooks {
-        Some(&ToolHooks {
-            index: Some(ref hook),
-            ..
-        }) => {
-            debug!("Using node.index hook to determine node index URL");
-            hook.resolve("index.json")?
-        }
-        _ => public_node_version_index(),
-    };
-
-    let first_pass = match_node_version(
-        &url,
-        |&NodeEntry {
-             ref version, lts, ..
-         }| { lts && matching.matches(version) },
-    )?;
-
-    match first_pass {
-        Some(version) => {
-            debug!(
-                "Found LTS node@{} matching requirement '{}' from {}",
-                version, matching, url
-            );
-            return Ok(version);
-        }
-        None => debug!(
-            "No LTS version found matching requirement '{}', checking for non-LTS",
-            matching
-        ),
-    };
-
-    match match_node_version(&url, |NodeEntry { version, .. }| matching.matches(version))? {
-        Some(version) => {
-            debug!(
-                "Found non-LTS node@{} matching requirement '{}' from {}",
-                version, matching, url
-            );
-            Ok(version)
-        }
-        None => Err(ErrorKind::NodeVersionNotFound {
-            matching: matching.to_string(),
-        }
-        .into()),
-    }
-}
-
 fn match_node_version(
     url: &str,
     predicate: impl Fn(&NodeEntry) -> bool,

crates/volta-core/src/version/mod.rs

@@ -33,9 +33,6 @@ pub enum VersionTag {
 
     /// An arbitrary tag version
     Custom(String),
-
-    /// An internal tag that represents the latest LTS version which matches a set of requirements
-    LtsRequirement(VersionReq),
 }
 
 impl fmt::Display for VersionSpec {
@@ -55,7 +52,6 @@ impl fmt::Display for VersionTag {
             VersionTag::Latest => write!(f, "latest"),
             VersionTag::Lts => write!(f, "lts"),
             VersionTag::Custom(s) => s.fmt(f),
-            VersionTag::LtsRequirement(req) => req.fmt(f),
         }
     }
 }