Skip to content

Commit 1afd416

Browse files
Folkert de Vriesdavidv1992
authored andcommitted
remove a level of indirection by Arc<Vec<T>> -> Arc<[T]>
1 parent 356f8cc commit 1afd416

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ntp-proto/src/nts_record.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ pub struct KeyExchangeServer {
13281328
state: State,
13291329
keyset: Arc<KeySet>,
13301330
#[cfg(feature = "nts-pool")]
1331-
pool_certificates: Arc<Vec<rustls::Certificate>>,
1331+
pool_certificates: Arc<[rustls::Certificate]>,
13321332
}
13331333

13341334
#[derive(Debug)]
@@ -1552,7 +1552,7 @@ impl KeyExchangeServer {
15521552
pub fn new(
15531553
tls_config: Arc<rustls::ServerConfig>,
15541554
keyset: Arc<KeySet>,
1555-
pool_certificates: Arc<Vec<rustls::Certificate>>,
1555+
pool_certificates: Arc<[rustls::Certificate]>,
15561556
) -> Result<Self, KeyExchangeError> {
15571557
// Ensure we send only ntske/1 as alpn
15581558
debug_assert_eq!(tls_config.alpn_protocols, &[b"ntske/1".to_vec()]);
@@ -2475,7 +2475,7 @@ mod test {
24752475
let client =
24762476
KeyExchangeClient::new_without_tls_write("localhost".into(), clientconfig).unwrap();
24772477
let server =
2478-
KeyExchangeServer::new(Arc::new(serverconfig), keyset, Arc::new(pool_cert)).unwrap();
2478+
KeyExchangeServer::new(Arc::new(serverconfig), keyset, pool_cert.into()).unwrap();
24792479

24802480
(client, server)
24812481
}

ntpd/src/daemon/keyexchange.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ async fn key_exchange_server(
165165
let listener = TcpListener::bind(&address).await?;
166166

167167
let config = build_server_config(certificate_chain, private_key)?;
168-
let pool_certs = Arc::new(pool_certs);
168+
let pool_certs = Arc::<[_]>::from(pool_certs);
169169

170170
loop {
171171
let (stream, peer_addr) = listener.accept().await?;
@@ -334,7 +334,7 @@ where
334334
io: IO,
335335
config: Arc<rustls::ServerConfig>,
336336
keyset: Arc<KeySet>,
337-
pool_certs: Arc<Vec<rustls::Certificate>>,
337+
pool_certs: Arc<[rustls::Certificate]>,
338338
) -> Result<Self, KeyExchangeError> {
339339
let data = BoundKeyExchangeServerData {
340340
io,
@@ -349,7 +349,7 @@ where
349349
io: IO,
350350
config: Arc<rustls::ServerConfig>,
351351
keyset: Arc<KeySet>,
352-
pool_certs: Arc<Vec<rustls::Certificate>>,
352+
pool_certs: Arc<[rustls::Certificate]>,
353353
) -> Result<(), KeyExchangeError> {
354354
let this = Self::new(io, config, keyset, pool_certs)?;
355355

@@ -723,7 +723,7 @@ mod tests {
723723
let private_key = private_key_from_bufread(pk.as_slice()).unwrap().unwrap();
724724

725725
let config = build_server_config(certificate_chain, private_key).unwrap();
726-
let pool_certs = Arc::new(vec![]);
726+
let pool_certs = Arc::<[_]>::from(vec![]);
727727

728728
let (stream, _) = listener.accept().await.unwrap();
729729

0 commit comments

Comments
 (0)