From 11fb9119ce3ac5578b91b35afb46b0e926e5ab79 Mon Sep 17 00:00:00 2001 From: Nikhil Benesch Date: Sun, 28 Aug 2022 22:03:20 -0400 Subject: [PATCH] deps: switch from `sha-1` to `sha1` The RustCrypto project recently got control of the crate name `sha1`. This commit switches over to the new name; the old `sha-1` name is now deprecated. Details: https://github.com/RustCrypto/hashes/pull/350 --- Cargo.lock | 2 +- deny.toml | 24 +++++++++++++++++++++--- src/expr/Cargo.toml | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0bb8eba23d5..c357ac223761 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3322,7 +3322,7 @@ dependencies = [ "serde", "serde_json", "serde_regex", - "sha-1", + "sha1", "sha2", "uncased", "uuid", diff --git a/deny.toml b/deny.toml index d7e02f179dbf..fb42f115aef4 100644 --- a/deny.toml +++ b/deny.toml @@ -1,15 +1,33 @@ [bans] multiple-versions = "deny" # Do not add exemptions for duplicate dependencies! Duplicate dependencies slow -# down compilation and bloat the binary. Submit PRs upstream to remove -# duplicated transitive dependencies. If necessary, use patch directives in the -# root Cargo.toml to point at a Materialize-maintained fork that avoids the +# down compilation, bloat the binary, and tickle race conditions in `cargo doc` +# (see rust-lang/cargo#3613). Submit PRs upstream to remove duplicated +# transitive dependencies. If necessary, use patch directives in the root +# Cargo.toml to point at a Materialize-maintained fork that avoids the # duplicated transitive dependencies. # Use `tracing` instead. [[bans.deny]] name = "env_logger" +# Use `md-5` instead, which is part of the RustCrypto ecosystem. +[[bans.deny]] +name = "md5" + +# Use `sha1` instead, which the RustCrypto ecosystem recently took control of. +# `sha-1` is the older and now deprecated name. +[[bans.deny]] +name = "sha-1" +wrappers = [ + # https://github.com/hyperium/headers/pull/117 + "headers", + # https://github.com/blackbeam/rust_mysql_common/pull/71 + "mysql_common", + # https://github.com/snapview/tungstenite-rs/pull/299 + "tungstenite", +] + # Use `prost` or `protobuf-native` instead. [[bans.deny]] name = "protobuf" diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index 78486bf51861..d68aa60043b7 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -42,7 +42,7 @@ regex-syntax = "0.6.27" serde = { version = "1.0.144", features = ["derive"] } serde_json = "1.0.82" serde_regex = "1.1.0" -sha-1 = "0.10.0" +sha1 = "0.10.0" sha2 = "0.10.2" uncased = "0.9.7" uuid = "1.1.2"