RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 13:37:48 +00:00
Code Issues Activity

Merge pull request #503 from ebfe/fix-build

Browse source 
Fix build with rust master
This commit is contained in:
Heather 2015-01-24 07:41:00 +03:00
commit 84bc38ee84
5 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
deps/regex vendored

@ -1 +1 @@
Subproject commit 094a68530a6550d5158988ec37afea75b95bbac9 Subproject commit 10edff6bb76f1c9f4423f3bb8ad373d0c7a69773

2
deps/rust-crypto vendored

@ -1 +1 @@
Subproject commit 716c4241e9a8e1e53dde4380eac2b454682ae81c Subproject commit d80341c5169649e88f2e89139049c596874803ab

2
deps/time vendored

@ -1 +1 @@
Subproject commit 7f105d4dd2bde23d4b8516dc02566cfc46b60b22 Subproject commit 9012258dcbf6416909b57205b928c4a5f048881e

2
src/base64/base64.rs
View file

@ -129,7 +129,7 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
} }
} }
Err(s) => { Err(s) => {
crash!(1, "error: {} ({})", s.description(), s.detail().unwrap_or("".to_string())); crash!(1, "error: {} ({:?})", s.description(), s);
} }
} }
} }

6
src/cp/cp.rs
View file

@ -117,8 +117,7 @@ fn copy(matches: getopts::Matches) {
let io_result = fs::copy(source, &dest); let io_result = fs::copy(source, &dest);
if io_result.is_err() { if let Err(err) = io_result {
let err = io_result.unwrap_err();
error!("error: {}", err.to_string()); error!("error: {}", err.to_string());
panic!(); panic!();
} }
@ -142,8 +141,7 @@ fn copy(matches: getopts::Matches) {
let io_result = fs::copy(source, &full_dest); let io_result = fs::copy(source, &full_dest);
if io_result.is_err() { if let Err(err) = io_result {
let err = io_result.unwrap_err();
error!("error: {}", err.to_string()); error!("error: {}", err.to_string());
panic!() panic!()
} }