Remove unnecessary API methods from Project

volta-cli · Jun 1, 2020 · 0657535 · 0657535
1 parent ea84cca
commit 0657535
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/crates/volta-core/src/project/mod.rs b/crates/volta-core/src/project/mod.rs
@@ -211,19 +211,6 @@ impl Project {
             .into())
         }
     }
-
-    // TODO: Remove these once the changes to `volta list` are merged
-    pub fn matching_bin(&self, _bin: &OsStr, _version: &Version) -> Fallible<Option<BinConfig>> {
-        Ok(None)
-    }
-
-    pub fn package_file(&self) -> PathBuf {
-        self.manifest_file.clone()
-    }
-
-    pub fn has_dependency(&self, _dep: &str, _version: &Version) -> bool {
-        false
-    }
 }
 
 fn is_node_root(dir: &Path) -> bool {

diff --git a/src/command/list/mod.rs b/src/command/list/mod.rs
@@ -141,7 +141,7 @@ impl Package {
     fn source(name: &str, project: Option<&Project>) -> Source {
         match project {
             Some(project) if project.has_direct_dependency(name) => {
-                Source::Project(project.package_file())
+                Source::Project(project.manifest_file().to_owned())
             }
             _ => Source::Default,
         }

diff --git a/src/command/list/toolchain.rs b/src/command/list/toolchain.rs
@@ -61,7 +61,7 @@ impl Lookup {
                 .and_then(self.version_from_spec())
                 .and_then(|project_version| {
                     if &project_version == version {
-                        Some(Source::Project(project.package_file()))
+                        Some(Source::Project(project.manifest_file().to_owned()))
                     } else {
                         None
                     }
@@ -90,7 +90,7 @@ impl Lookup {
             Some(project) => project
                 .platform()
                 .and_then(self.version_from_spec())
-                .map(|version| (Source::Project(project.package_file()), version)),
+                .map(|version| (Source::Project(project.manifest_file().to_owned()), version)),
             None => default
                 .clone()
                 .and_then(self.version_from_spec())
@@ -104,7 +104,7 @@ fn tool_source(name: &str, project: Option<&Project>) -> Fallible<Source> {
     match project {
         Some(project) => {
             if project.has_direct_bin(name.as_ref())? {
-                Ok(Source::Project(project.package_file()))
+                Ok(Source::Project(project.manifest_file().to_owned()))
             } else {
                 Ok(Source::Default)
             }