From 1194a8ce534e88cf213ddc3b66bb8d357455cf56 Mon Sep 17 00:00:00 2001 From: Narasimha Prasanna HN Date: Tue, 1 Feb 2022 02:26:47 +0530 Subject: [PATCH] Fix: Update quick-error crate version from 1.2.3 to 2.0.1 in src/uu/cp (#2947) fix: update quick-error crate from 1.2.3 to 2.0.1 for src/uu/cp tool, fixes: #2941 --- Cargo.lock | 10 ++-------- src/uu/cp/Cargo.toml | 2 +- src/uu/cp/src/cp.rs | 6 +++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 975053be5..cc7c3967b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1468,12 +1468,6 @@ dependencies = [ "unicode-xid 0.2.2", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.1" @@ -2199,7 +2193,7 @@ dependencies = [ "filetime", "ioctl-sys", "libc", - "quick-error 1.2.3", + "quick-error", "selinux", "uucore", "walkdir", @@ -2664,7 +2658,7 @@ dependencies = [ "clap 3.0.10", "getopts", "itertools", - "quick-error 2.0.1", + "quick-error", "regex", "uucore", ] diff --git a/src/uu/cp/Cargo.toml b/src/uu/cp/Cargo.toml index d0ba419d0..221c02465 100644 --- a/src/uu/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -22,7 +22,7 @@ path = "src/cp.rs" clap = { version = "3.0", features = ["wrap_help", "cargo"] } filetime = "0.2" libc = "0.2.85" -quick-error = "1.2.3" +quick-error = "2.0.1" selinux = { version="0.2", optional=true } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] } walkdir = "2.2" diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index 374ab2f81..f8ce6f241 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -64,14 +64,14 @@ quick_error! { #[derive(Debug)] pub enum Error { /// Simple io::Error wrapper - IoErr(err: io::Error) { from() cause(err) display("{}", err)} + IoErr(err: io::Error) { from() source(err) display("{}", err)} /// Wrapper for io::Error with path context IoErrContext(err: io::Error, path: String) { display("{}: {}", path, err) context(path: &'a str, err: io::Error) -> (err, path.to_owned()) context(context: String, err: io::Error) -> (err, context) - cause(err) + source(err) } /// General copy error @@ -86,7 +86,7 @@ quick_error! { NotAllFilesCopied {} /// Simple walkdir::Error wrapper - WalkDirErr(err: walkdir::Error) { from() display("{}", err) cause(err) } + WalkDirErr(err: walkdir::Error) { from() display("{}", err) source(err) } /// Simple std::path::StripPrefixError wrapper StripPrefixError(err: StripPrefixError) { from() }