From: Aleksey Kladov Date: Mon, 16 Apr 2018 14:57:25 +0000 (+0300) Subject: Remove `internal` from error handling X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~69^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2f33787f0cfda6e7dfd19e2b0bceb2f3849126f;p=cargo.git Remove `internal` from error handling --- diff --git a/src/cargo/util/paths.rs b/src/cargo/util/paths.rs index eb5ada5cb..350663620 100644 --- a/src/cargo/util/paths.rs +++ b/src/cargo/util/paths.rs @@ -8,8 +8,7 @@ use std::iter; use filetime::FileTime; -use util::{internal, CargoResult}; -use util::errors::{CargoError, CargoResultExt, Internal}; +use util::errors::{CargoError, CargoResult, CargoResultExt, Internal}; pub fn join_paths>(paths: &[T], env: &str) -> CargoResult { let err = match env::join_paths(paths.iter()) { @@ -154,13 +153,13 @@ pub fn append(path: &Path, contents: &[u8]) -> CargoResult<()> { f.write_all(contents)?; Ok(()) })() - .chain_err(|| internal(format!("failed to write `{}`", path.display())))?; + .chain_err(|| format!("failed to write `{}`", path.display()))?; Ok(()) } pub fn mtime(path: &Path) -> CargoResult { let meta = - fs::metadata(path).chain_err(|| internal(format!("failed to stat `{}`", path.display())))?; + fs::metadata(path).chain_err(|| format!("failed to stat `{}`", path.display()))?; Ok(FileTime::from_last_modification_time(&meta)) }