From: Carl Lerche <me@carllerche.com>
Date: Fri, 9 May 2014 17:29:49 +0000 (-0700)
Subject: Switch important_paths to using result::CargoResult
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1065
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=deb2b70a26bdca0334a783f729e15773ae0b354b;p=cargo.git

Switch important_paths to using result::CargoResult
---

diff --git a/src/cargo/util/important_paths.rs b/src/cargo/util/important_paths.rs
index 81fce8bd4..ec53e41f4 100644
--- a/src/cargo/util/important_paths.rs
+++ b/src/cargo/util/important_paths.rs
@@ -1,4 +1,4 @@
-use core::errors::{CargoResult,CargoError,MissingManifest};
+use util::{other_error,CargoResult,CargoError};
 
 pub fn find_project(pwd: Path, file: ~str) -> CargoResult<Path> {
     let mut current = pwd.clone();
@@ -11,5 +11,10 @@ pub fn find_project(pwd: Path, file: ~str) -> CargoResult<Path> {
         if !current.pop() { break; }
     }
 
-    Err(CargoError::internal(MissingManifest(pwd, file)))
+    Err(manifest_missing_err(&pwd, file.as_slice()))
+}
+
+fn manifest_missing_err(pwd: &Path, file: &str) -> CargoError {
+    other_error("manifest not found")
+        .with_detail(format!("pwd={}; file={}", pwd.display(), file))
 }