From: Carl Lerche <me@carllerche.com>
Date: Fri, 9 May 2014 17:10:39 +0000 (-0700)
Subject: Misc cleanup
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1067
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=de0ef6b5cd261723c839c4d7da1d400aa8712daf;p=cargo.git

Misc cleanup
---

diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs
index 336368fe7..e1522caaa 100644
--- a/src/cargo/ops/cargo_compile.rs
+++ b/src/cargo/ops/cargo_compile.rs
@@ -22,9 +22,7 @@ use core::resolver::resolve;
 use sources::path::PathSource;
 use ops::cargo_rustc;
 use ops::cargo_read_manifest::read_manifest;
-// use core::errors::{CargoError,CLIError,CLIResult,ToResult};
-use core::summary::SummaryVec;
-use util::{other_error, CargoError, CargoResult, Wrap};
+use util::{other_error, CargoResult, Wrap};
 
 pub fn compile(manifest_path: &str) -> CargoResult<()> {
     let root_dep = try!(read_manifest(manifest_path)).to_dependency();
diff --git a/src/cargo/ops/cargo_rustc.rs b/src/cargo/ops/cargo_rustc.rs
index 9af537bae..e93129f92 100644
--- a/src/cargo/ops/cargo_rustc.rs
+++ b/src/cargo/ops/cargo_rustc.rs
@@ -1,7 +1,6 @@
 use std::os::args;
 use std::io;
 use std::path::Path;
-use core::errors::{CLIError,CLIResult,ToResult};
 use core;
 use util;
 use util::{other_error,CargoResult,CargoError};
@@ -28,7 +27,7 @@ fn compile_pkg(pkg: &core::Package, pkgs: &core::PackageSet) -> CargoResult<()>
     let target_dir = pkg.get_absolute_target_dir();
 
     // First ensure that the directory exists
-    try!(mk_target(&target_dir).map_err(|err| other_error("could not create target directory")));
+    try!(mk_target(&target_dir).map_err(|_| other_error("could not create target directory")));
 
     // compile
     for target in pkg.get_targets().iter() {
diff --git a/src/cargo/util/result.rs b/src/cargo/util/result.rs
index f836e7371..1bf9072df 100644
--- a/src/cargo/util/result.rs
+++ b/src/cargo/util/result.rs
@@ -63,7 +63,17 @@ pub trait Wrap {
 
 impl<T> Wrap for Result<T, CargoError> {
     fn wrap(self, desc: &'static str) -> Result<T, CargoError> {
-        self
+        match self {
+            Ok(x) => Ok(x),
+            Err(e) => {
+                Err(CargoError {
+                    kind: e.kind.clone(),
+                    desc: desc,
+                    detail: None,
+                    cause: Some(box e)
+                })
+            }
+        }
     }
 }