RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Fix: Update quick-error crate version from 1.2.3 to 2.0.1 in src/uu/cp (#2947)

Browse source 
fix: update quick-error crate from 1.2.3 to 2.0.1 for src/uu/cp tool, fixes:  #2941
This commit is contained in:
Narasimha Prasanna HN 2022-02-01 02:26:47 +05:30 • committed by GitHub
parent 7fc82cd376
commit 1194a8ce53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -1468,12 +1468,6 @@ dependencies = [
"unicode-xid 0.2.2", "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]] [[package]]
name = "quick-error" name = "quick-error"
version = "2.0.1" version = "2.0.1"
@ -2199,7 +2193,7 @@ dependencies = [
"filetime", "filetime",
"ioctl-sys", "ioctl-sys",
"libc", "libc",
"quick-error 1.2.3", "quick-error",
"selinux", "selinux",
"uucore", "uucore",
"walkdir", "walkdir",
@ -2664,7 +2658,7 @@ dependencies = [
"clap 3.0.10", "clap 3.0.10",
"getopts", "getopts",
"itertools", "itertools",
"quick-error 2.0.1", "quick-error",
"regex", "regex",
"uucore", "uucore",
] ]

2
src/uu/cp/Cargo.toml
View file

@ -22,7 +22,7 @@ path = "src/cp.rs"
clap = { version = "3.0", features = ["wrap_help", "cargo"] } clap = { version = "3.0", features = ["wrap_help", "cargo"] }
filetime = "0.2" filetime = "0.2"
libc = "0.2.85" libc = "0.2.85"
quick-error = "1.2.3" quick-error = "2.0.1"
selinux = { version="0.2", optional=true } selinux = { version="0.2", optional=true }
uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] } uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["entries", "fs", "perms", "mode"] }
walkdir = "2.2" walkdir = "2.2"

6
src/uu/cp/src/cp.rs
View file

@ -64,14 +64,14 @@ quick_error! {
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
/// Simple io::Error wrapper /// 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 /// Wrapper for io::Error with path context
IoErrContext(err: io::Error, path: String) { IoErrContext(err: io::Error, path: String) {
display("{}: {}", path, err) display("{}: {}", path, err)
context(path: &'a str, err: io::Error) -> (err, path.to_owned()) context(path: &'a str, err: io::Error) -> (err, path.to_owned())
context(context: String, err: io::Error) -> (err, context) context(context: String, err: io::Error) -> (err, context)
cause(err) source(err)
} }
/// General copy error /// General copy error
@ -86,7 +86,7 @@ quick_error! {
NotAllFilesCopied {} NotAllFilesCopied {}
/// Simple walkdir::Error wrapper /// 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 /// Simple std::path::StripPrefixError wrapper
StripPrefixError(err: StripPrefixError) { from() } StripPrefixError(err: StripPrefixError) { from() }