From d99a0dbbe0a3b0f5e5ea0bfde7c192bd16d3c425 Mon Sep 17 00:00:00 2001
From: Zelda Hessler <zhessler@amazon.com>
Date: Thu, 17 Nov 2022 12:02:31 -0600
Subject: [PATCH] fix: use new version of deprecated fn (#1994)
update: crate-hasher sha256 dep to 1.1
---
tools/crate-hasher/Cargo.lock | 8 ++++----
tools/crate-hasher/Cargo.toml | 2 +-
tools/crate-hasher/src/file_list.rs | 5 +++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tools/crate-hasher/Cargo.lock b/tools/crate-hasher/Cargo.lock
index 9fed13f46..df4ff9f4f 100644
--- a/tools/crate-hasher/Cargo.lock
+++ b/tools/crate-hasher/Cargo.lock
@@ -500,12 +500,12 @@ dependencies = [
[[package]]
name = "sha256"
-version = "1.0.3"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e84a7f596c081d359de5e06a83877138bc3c4483591e1af1916e1472e6e146e"
+checksum = "e334db67871c14c18fc066ad14af13f9fdf5f9a91c61af432d1e3a39c8c6a141"
dependencies = [
- "hex",
- "sha2",
+ "hex",
+ "sha2",
]
[[package]]
diff --git a/tools/crate-hasher/Cargo.toml b/tools/crate-hasher/Cargo.toml
index da23737b2..df6853542 100644
--- a/tools/crate-hasher/Cargo.toml
+++ b/tools/crate-hasher/Cargo.toml
@@ -17,7 +17,7 @@ opt-level = 0
anyhow = "1.0"
clap = { version = "~3.1.18", features = ["derive"] }
ignore = "0.4"
-sha256 = "1.0"
+sha256 = "1.1"
[dev-dependencies]
flate2 = "1.0"
diff --git a/tools/crate-hasher/src/file_list.rs b/tools/crate-hasher/src/file_list.rs
index 03f6090cb..698caca2b 100644
--- a/tools/crate-hasher/src/file_list.rs
+++ b/tools/crate-hasher/src/file_list.rs
@@ -3,12 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
-use anyhow::{Context, Result};
use std::collections::BTreeSet;
use std::fmt::Write;
use std::fs::Metadata;
use std::path::Path;
+use anyhow::{Context, Result};
+
#[derive(Debug, Default)]
pub struct FileList(BTreeSet<FileMetadata>);
@@ -64,7 +65,7 @@ impl FileList {
.to_str()
.expect("not using unusual file names in crate source")
.into(),
- sha256: sha256::digest_file(&path).context("hash file")?,
+ sha256: sha256::try_digest(path).context("hash file")?,
});
}
}
--
GitLab