Skip to content

Commit 18ce518

Browse files
ephemeralriggserickt
ephemeralriggs
authored and
erickt
committed
[tuf][interop-tests] Migrate lazy_static to LazyLock
* Use LazyLock (stable after 1.80.0) * Require 1.80.0 as the minimum Rust version * While on it: Update most dependencies * Bump version to 0.3.0-beta14
1 parent a07711a commit 18ce518

5 files changed

Lines changed: 60 additions & 67 deletions

File tree

‎interop-tests/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "interop-tests"
3-
version = "0.1.0"
3+
version = "0.1.1"
44
authors = [ "heartsucker <heartsucker@autistici.org>", "Erick Tryzelaar <etryzelaar@google.com>" ]
55
description = "TUF library interoperation tests"
66
homepage = "https://github.com/theupdateframework/rust-tuf"
@@ -11,18 +11,18 @@ license = "MIT/Apache-2.0"
1111
publish = false
1212

1313
[dependencies]
14-
chrono = { version = "0.4.23", features = [ "serde" ] }
15-
data-encoding = "2.0.0-rc.2"
16-
futures-executor = "0.3.1"
14+
chrono = { version = "0.4.42", features = [ "serde" ] }
15+
data-encoding = "2.9.0"
16+
futures-executor = "0.3.31"
1717
serde = "1"
1818
serde_derive = "1"
1919
serde_json = "1"
2020
tuf = { path = "../tuf" }
21-
walkdir = "2.3.2"
21+
walkdir = "2.5.0"
2222

2323
[dev-dependencies]
2424
assert_matches = "1.5.0"
25-
futures-util = { version = "0.3.1", features = [ "io" ] }
25+
futures-util = { version = "0.3.31", features = [ "io" ] }
2626
pretty_assertions = "1"
2727
tempfile = "3"
2828

‎tuf/Cargo.toml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "tuf"
33
edition = "2021"
4-
version = "0.3.0-beta13"
5-
rust-version = "1.71.1"
4+
version = "0.3.0-beta14"
5+
rust-version = "1.80.0"
66
authors = [ "heartsucker <heartsucker@autistici.org>", "Erick Tryzelaar <etryzelaar@google.com>" ]
77
description = "Library for The Update Framework (TUF)"
88
homepage = "https://github.com/theupdateframework/rust-tuf"
@@ -18,12 +18,12 @@ name = "tuf"
1818
path = "./src/lib.rs"
1919

2020
[dependencies]
21-
chrono = { version = "0.4.34", features = [ "serde" ] }
22-
data-encoding = "2.0.0-rc.2"
23-
futures-io = "0.3.1"
24-
futures-util = { version = "0.3.1", features = [ "io" ] }
25-
http = "0.2.0"
26-
hyper = { version = "0.14.15", default-features = false, features = [ "stream", "client", "http1" ], optional = true }
21+
chrono = { version = "0.4.42", features = [ "serde" ] }
22+
data-encoding = "2.9.0"
23+
futures-io = "0.3.31"
24+
futures-util = { version = "0.3.31", features = [ "io" ] }
25+
http = "0.2.4"
26+
hyper = { version = "0.14.19", default-features = false, features = [ "stream", "client", "http1" ], optional = true }
2727
itoa = "1.0"
2828
log = "0.4"
2929
percent-encoding = "2.1"
@@ -32,14 +32,13 @@ serde = "1"
3232
serde_derive = "1"
3333
serde_json = "1"
3434
tempfile = "3"
35-
thiserror = "1.0"
35+
thiserror = "2.0"
3636
untrusted = "0.9"
3737
url = "2"
3838

3939
[dev-dependencies]
4040
assert_matches = "1.5.0"
41-
futures-executor = "0.3.1"
42-
lazy_static = "1"
41+
futures-executor = "0.3.31"
4342
maplit = "1"
4443
pretty_assertions = "1"
4544

‎tuf/src/client.rs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,28 +1309,26 @@ mod test {
13091309
use assert_matches::assert_matches;
13101310
use chrono::prelude::*;
13111311
use futures_executor::block_on;
1312-
use lazy_static::lazy_static;
13131312
use maplit::hashmap;
13141313
use pretty_assertions::assert_eq;
13151314
use serde_json::json;
13161315
use std::collections::HashMap;
13171316
use std::iter::once;
1318-
1319-
lazy_static! {
1320-
static ref KEYS: Vec<Ed25519PrivateKey> = {
1321-
let keys: &[&[u8]] = &[
1322-
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1323-
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1324-
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1325-
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1326-
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1327-
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1328-
];
1329-
keys.iter()
1330-
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1331-
.collect()
1332-
};
1333-
}
1317+
use std::sync::LazyLock;
1318+
1319+
static KEYS: LazyLock<Vec<Ed25519PrivateKey>> = LazyLock::new(|| {
1320+
let keys: &[&[u8]] = &[
1321+
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1322+
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1323+
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1324+
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1325+
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1326+
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1327+
];
1328+
keys.iter()
1329+
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1330+
.collect()
1331+
});
13341332

13351333
#[allow(clippy::enum_variant_names)]
13361334
enum ConstructorMode {

‎tuf/src/database.rs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,24 +1088,22 @@ mod test {
10881088
};
10891089
use crate::pouf::Pouf1;
10901090
use assert_matches::assert_matches;
1091-
use lazy_static::lazy_static;
10921091
use std::iter::once;
1093-
1094-
lazy_static! {
1095-
static ref KEYS: Vec<Ed25519PrivateKey> = {
1096-
let keys: &[&[u8]] = &[
1097-
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1098-
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1099-
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1100-
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1101-
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1102-
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1103-
];
1104-
keys.iter()
1105-
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1106-
.collect()
1107-
};
1108-
}
1092+
use std::sync::LazyLock;
1093+
1094+
static KEYS: LazyLock<Vec<Ed25519PrivateKey>> = LazyLock::new(|| {
1095+
let keys: &[&[u8]] = &[
1096+
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1097+
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1098+
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1099+
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1100+
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1101+
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1102+
];
1103+
keys.iter()
1104+
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1105+
.collect()
1106+
});
11091107

11101108
#[test]
11111109
fn root_trusted_keys_success() {

‎tuf/src/repo_builder.rs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,27 +1582,25 @@ mod tests {
15821582
},
15831583
futures_executor::block_on,
15841584
futures_util::io::{AsyncReadExt, Cursor},
1585-
lazy_static::lazy_static,
15861585
maplit::hashmap,
15871586
pretty_assertions::assert_eq,
15881587
std::collections::BTreeMap,
1588+
std::sync::LazyLock,
15891589
};
15901590

1591-
lazy_static! {
1592-
static ref KEYS: Vec<Ed25519PrivateKey> = {
1593-
let keys: &[&[u8]] = &[
1594-
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1595-
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1596-
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1597-
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1598-
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1599-
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1600-
];
1601-
keys.iter()
1602-
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1603-
.collect()
1604-
};
1605-
}
1591+
static KEYS: LazyLock<Vec<Ed25519PrivateKey>> = LazyLock::new(|| {
1592+
let keys: &[&[u8]] = &[
1593+
include_bytes!("../tests/ed25519/ed25519-1.pk8.der"),
1594+
include_bytes!("../tests/ed25519/ed25519-2.pk8.der"),
1595+
include_bytes!("../tests/ed25519/ed25519-3.pk8.der"),
1596+
include_bytes!("../tests/ed25519/ed25519-4.pk8.der"),
1597+
include_bytes!("../tests/ed25519/ed25519-5.pk8.der"),
1598+
include_bytes!("../tests/ed25519/ed25519-6.pk8.der"),
1599+
];
1600+
keys.iter()
1601+
.map(|b| Ed25519PrivateKey::from_pkcs8(b).unwrap())
1602+
.collect()
1603+
});
16061604

16071605
fn create_root(
16081606
version: u32,

0 commit comments

Comments
 (0)