Skip to content

Commit 8b0b30f

Browse files
no30bitstevenjrafal-ch
authored
chore(rust/hermes-ipfs): bump rust-ipfs for hermes-ipfs (#422)
* bump rust-ipfs * bump catalyst-ci * bump catalyst-ci * sync-cfg * upd to rust 1.88 * spelling * fix lints * revert clippy fix * Revert "upd to rust 1.88" This reverts commit 52a726e. * Revert rust fmt related changes * Remove the `match_on_vec_items` lint which has been removed in Rust 1.88 * Fix lints * Revert accidental change * Revert "Revert accidental change" This reverts commit 5e9d637. --------- Co-authored-by: Steven Johnson <[email protected]> Co-authored-by: rafal-ch <[email protected]>
1 parent 4ec166b commit 8b0b30f

File tree

40 files changed

+101
-124
lines changed

40 files changed

+101
-124
lines changed

.config/dictionaries/project.dic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ mdns
171171
MEMMAP
172172
memx
173173
Metadatum
174+
metno
174175
mgrybyk
175176
mimalloc
176177
minicbor

integration_tests/rust/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ exit = "deny"
3030
get_unwrap = "deny"
3131
index_refutable_slice = "deny"
3232
indexing_slicing = "deny"
33-
match_on_vec_items = "deny"
3433
match_wild_err_arm = "deny"
3534
missing_panics_doc = "deny"
3635
panic = "deny"

rust/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ exit = "deny"
5252
get_unwrap = "deny"
5353
index_refutable_slice = "deny"
5454
indexing_slicing = "deny"
55-
match_on_vec_items = "deny"
5655
match_wild_err_arm = "deny"
5756
missing_panics_doc = "deny"
5857
panic = "deny"

rust/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.4.1 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.4.9 AS rust-ci
44
IMPORT ../ AS repo-ci
55

66
COPY_SRC:

rust/c509-certificate/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ oid-registry = "0.7.1"
2525
asn1-rs = "0.6.2"
2626
anyhow = "1.0.95"
2727
bimap = "0.6.3"
28-
once_cell = "1.20.2"
2928
strum = "0.26.3"
3029
strum_macros = "0.26.4"
3130
regex = "1.11.1"

rust/c509-certificate/examples/cli/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ fn generate(
200200
// If the output path is provided, write to the file
201201
if let Some(output) = output {
202202
write_to_output_file(output, &cert)?;
203-
};
203+
}
204204

205205
println!("Hex: {:?}", hex::encode(&cert));
206206
println!("Bytes: {:?}", &cert);
@@ -290,7 +290,7 @@ fn verify(file: &PathBuf, public_key: PathBuf) -> anyhow::Result<()> {
290290
match c509_certificate::verify(&cert, &pk) {
291291
Ok(()) => println!("Signature verified!"),
292292
Err(e) => println!("Signature verification failed: {e}"),
293-
};
293+
}
294294
Ok(())
295295
}
296296

@@ -328,7 +328,7 @@ fn decode(file: &PathBuf, output: Option<PathBuf>) -> anyhow::Result<()> {
328328
// If the output path is provided, write to the file
329329
if let Some(output) = output {
330330
write_to_output_file(output, data.as_bytes())?;
331-
};
331+
}
332332

333333
println!("{data}");
334334
Ok(())

rust/c509-certificate/src/attributes/attribute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl Encode<()> for AttributeValue {
198198
match self {
199199
AttributeValue::Text(text) => encode_helper(e, "Attribute value", ctx, text)?,
200200
AttributeValue::Bytes(bytes) => encode_helper(e, "Attribute value", ctx, bytes)?,
201-
};
201+
}
202202
Ok(())
203203
}
204204
}

rust/c509-certificate/src/attributes/data.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
//! Attribute. See [C509 Certificate](https://datatracker.ietf.org/doc/draft-ietf-cose-cbor-encoded-cert/11/)
33
//! Section 9.3 C509 Attributes Registry for more information.
44
5+
use std::sync::LazyLock;
6+
57
use anyhow::Error;
68
use asn1_rs::{oid, Oid};
7-
use once_cell::sync::Lazy;
89

910
use crate::tables::IntegerToOidTable;
1011

@@ -62,7 +63,7 @@ impl AttributeData {
6263
}
6364

6465
/// Define static lookup for attributes table
65-
static ATTRIBUTES_TABLES: Lazy<AttributeData> = Lazy::new(|| {
66+
static ATTRIBUTES_TABLES: LazyLock<AttributeData> = LazyLock::new(|| {
6667
let mut int_to_oid_table = IntegerToOidTable::new();
6768

6869
for data in ATTRIBUTE_DATA {
@@ -73,7 +74,7 @@ static ATTRIBUTES_TABLES: Lazy<AttributeData> = Lazy::new(|| {
7374
});
7475

7576
/// Static reference to the `AttributeData` lookup table.
76-
pub(crate) static ATTRIBUTES_LOOKUP: &Lazy<AttributeData> = &ATTRIBUTES_TABLES;
77+
pub(crate) static ATTRIBUTES_LOOKUP: &LazyLock<AttributeData> = &ATTRIBUTES_TABLES;
7778

7879
/// Get the OID from the int value.
7980
pub(crate) fn get_oid_from_int(i: i16) -> Result<Oid<'static>, Error> {

rust/c509-certificate/src/c509.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ impl Encode<()> for C509 {
5151
match self.issuer_signature_value {
5252
Some(ref value) => encode_bytes(e, "C509 Issuer Signature value", value)?,
5353
None => encode_null(e, "C509 Issuer Signature value")?,
54-
};
54+
}
5555
Ok(())
5656
}
5757
}

rust/c509-certificate/src/extensions/extension/data.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
55
// cspell: words Evt
66

7-
use std::collections::HashMap;
7+
use std::{collections::HashMap, sync::LazyLock};
88

99
use anyhow::Error;
1010
use asn1_rs::{oid, Oid};
11-
use once_cell::sync::Lazy;
1211

1312
use super::ExtensionValueType;
1413
use crate::tables::IntegerToOidTable;
@@ -96,7 +95,7 @@ impl ExtensionData {
9695
}
9796

9897
/// Define static lookup for extensions table
99-
static EXTENSIONS_TABLES: Lazy<ExtensionData> = Lazy::new(|| {
98+
static EXTENSIONS_TABLES: LazyLock<ExtensionData> = LazyLock::new(|| {
10099
let mut int_to_oid_table = IntegerToOidTable::new();
101100
let mut int_to_type_table = HashMap::<i16, ExtensionValueType>::new();
102101

@@ -112,7 +111,7 @@ static EXTENSIONS_TABLES: Lazy<ExtensionData> = Lazy::new(|| {
112111
});
113112

114113
/// Static reference to the `ExtensionData` lookup table.
115-
pub(crate) static EXTENSIONS_LOOKUP: &Lazy<ExtensionData> = &EXTENSIONS_TABLES;
114+
pub(crate) static EXTENSIONS_LOOKUP: &LazyLock<ExtensionData> = &EXTENSIONS_TABLES;
116115

117116
/// Get the OID from the int value.
118117
pub(crate) fn get_oid_from_int(i: i16) -> Result<Oid<'static>, Error> {

0 commit comments

Comments
 (0)