Comment cleanup

diff --git a/src/cargo/core/manifest.rs b/src/cargo/core/manifest.rs
index 95ca363fe9ea80cede185950847c1669ba00d19b..6070d24d839b6f03482682719ca1f45712ee10f8 100644 (file)
--- a/src/cargo/core/manifest.rs
+++ b/src/cargo/core/manifest.rs
@@ -58,33 +58,6 @@ impl Manifest {
     pub fn get_target_dir<'a>(&'a self) -> &'a Path {
         &self.target_dir
     }
-
-    /*
-    pub fn from_serialized(path: &str, serialized: &SerializedManifest) -> CargoResult<Manifest> {
-        let (lib,bin) = normalize(&serialized.lib, &serialized.bin);
-        let &SerializedManifest { ref project, ref dependencies, .. } = serialized;
-
-        let deps = dependencies.clone().map(|deps| {
-            deps.iter().map(|(k,v)| {
-                // This can produce an invalid version, but it's temporary because this needs
-                // to be replaced with Dependency, not NameVer
-                Dependency::with_namever(&NameVer::new(k.clone(), v.clone()))
-            }).collect()
-        }).unwrap_or_else(|| vec!());
-
-        let root = try!(Path::new(path.to_owned()).dirname_str().map(|s| s.to_owned()).to_result(|_|
-            CargoError::internal(PathError(format!("Couldn't convert {} to a directory name", path)))));
-
-        Ok(Manifest {
-            root: root.to_owned(),
-            project: project.clone(),
-            lib: lib,
-            bin: bin,
-            target: "target".to_owned(),
-            dependencies: deps
-        })
-    }
-    */
 }
 
 impl Target {

diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index ec6c9557a60efdec2e0f8e6f85d2ec3cc3e8b455..b8e40a84ca8c2a81790176f0248c284b386ce3a2 100644 (file)
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -8,33 +8,3 @@ use core::{
 pub trait Registry {
   fn query<'a>(&'a self, name: &str) -> Vec<&'a Package>;
 }
-
-/*
- *
- * ===== Temporary for convenience =====
- *
- */
-
-/*
-pub struct MemRegistry {
-  packages: Vec<Package>
-}
-
-impl MemRegistry {
-  pub fn new(packages: &Vec<Package>) -> MemRegistry {
-    MemRegistry { packages: packages.clone() }
-  }
-
-  pub fn empty() -> MemRegistry {
-    MemRegistry { packages: Vec::new() }
-  }
-}
-
-impl Registry for MemRegistry {
-  fn query<'a>(&'a self, name: &str) -> Vec<&'a Package> {
-    self.packages.iter()
-      .filter(|pkg| name == pkg.get_name())
-      .collect()
-  }
-}
-*/

diff --git a/src/cargo/core/resolver.rs b/src/cargo/core/resolver.rs
index 7d22a718bd029b1a43fb8efe3c97eddaff402c52..0a944c980b0fefcfc3a3c639bb50870b72447ff8 100644 (file)
--- a/src/cargo/core/resolver.rs
+++ b/src/cargo/core/resolver.rs
@@ -3,6 +3,10 @@ use core;
 use core::package::PackageSet;
 use core::errors::CargoResult;
 
+/* TODO:
+ * - The correct input here is not a registry. Resolves should be performable
+ * on package summaries vs. the packages themselves.
+ */
 #[allow(dead_code)]
 pub fn resolve(deps: &[core::Dependency], registry: &core::Registry) -> CargoResult<PackageSet> {
     let mut remaining = Vec::from_slice(deps);