diff --git a/Cargo.lock b/Cargo.lock index 5a99700d1..12a2c2ffe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -957,9 +957,9 @@ dependencies = [ [[package]] name = "hex" -version = "0.2.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a22814455d41612f41161581c2883c0c6a1c41852729b17d5ed88f01e153aa" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-literal" diff --git a/src/uu/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml index d3170689a..49e99c59c 100644 --- a/src/uu/hashsum/Cargo.toml +++ b/src/uu/hashsum/Cargo.toml @@ -17,7 +17,7 @@ path = "src/hashsum.rs" [dependencies] digest = "0.10.1" clap = { version = "3.0", features = ["wrap_help", "cargo"] } -hex = "0.2.0" +hex = "0.4.3" libc = "0.2.42" memchr = "2" md5 = "0.3.5" diff --git a/src/uu/hashsum/src/digest.rs b/src/uu/hashsum/src/digest.rs index 678c44886..719eadcbf 100644 --- a/src/uu/hashsum/src/digest.rs +++ b/src/uu/hashsum/src/digest.rs @@ -14,7 +14,7 @@ extern crate sha3; use std::io::Write; -use hex::ToHex; +use hex::encode; #[cfg(windows)] use memchr::memmem; @@ -32,7 +32,7 @@ pub trait Digest { fn result_str(&mut self) -> String { let mut buf: Vec = vec![0; self.output_bytes()]; self.result(&mut buf); - buf.to_hex() + encode(buf) } } diff --git a/src/uu/hashsum/src/hashsum.rs b/src/uu/hashsum/src/hashsum.rs index fe607b554..46e8ce1b8 100644 --- a/src/uu/hashsum/src/hashsum.rs +++ b/src/uu/hashsum/src/hashsum.rs @@ -21,7 +21,7 @@ use self::digest::Digest; use self::digest::DigestWriter; use clap::{App, AppSettings, Arg, ArgMatches}; -use hex::ToHex; +use hex::encode; use md5::Context as Md5; use regex::Regex; use sha1::Sha1; @@ -652,6 +652,6 @@ fn digest_reader( let mut bytes = Vec::new(); bytes.resize((output_bits + 7) / 8, 0); digest.result(&mut bytes); - Ok(bytes.to_hex()) + Ok(encode(bytes)) } }