Skip to content

Commit 6cf367c

Browse files
committed
Fix: Update anyhow to address RustSec advisories, reverting p12 to 2021 and ignore cargo warning
1 parent 7a8d9bb commit 6cf367c

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/operator-binary/src/utils.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ pub fn error_full_message(err: &dyn std::error::Error) -> String {
121121
}
122122

123123
/// Propagates `Ok(true)` and `Err(_)` from `stream`, otherwise returns `Ok(false)`.
124+
#[allow(tail_expr_drop_order)]
124125
pub async fn trystream_any<S: Stream<Item = Result<bool, E>>, E>(stream: S) -> Result<bool, E> {
125126
pin_mut!(stream);
126127
while let Some(value) = stream.next().await {
@@ -130,6 +131,7 @@ pub async fn trystream_any<S: Stream<Item = Result<bool, E>>, E>(stream: S) -> R
130131
}
131132
Ok(false)
132133
}
134+
133135
/// Concatenate chunks of bytes, short-circuiting on [`Err`].
134136
///
135137
/// This is a byte-oriented equivalent to [`Iterator::collect::<Result<String, _>>`](`Iterator::collect`).

rust/p12/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
name = "p12"
33
version.workspace = true
44
authors = ["hjiayz <hjiayz@gmail.com>", "Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"]
5-
edition.workspace = true
5+
edition = "2021"
66
keywords = ["pkcs12", "pkcs"]
77
description = "pure rust pkcs12 tool (Stackable fork)"
88
homepage = "https://github.com/hjiayz/p12"
99
repository = "https://github.com/hjiayz/p12"
1010
readme = "README.md"
1111
license = "MIT OR Apache-2.0"
12-
rust-version = "1.85.0"
12+
rust-version = "1.56.0"
1313

1414
# Dependencies are tracked inline for now, to minimize divergence from upstream
1515

0 commit comments

Comments
 (0)