Merge pull request #1124 from sozu-proxy/bump-toolchain-to-1.80.0

bump rust-toolchain to 1.80.0
sozu-proxy · Aug 1, 2024 · 1859915 · 1859915
2 parents 57399e0 + e48b26d
commit 1859915
Show file tree

Hide file tree

Showing 12 changed files with 396 additions and 264 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -15,7 +15,7 @@ authors = [
 ]
 categories = ["network-programming"]
 edition = "2021"
-rust-version = "1.74.0"
+rust-version = "1.80.0"
 include = ["README.md", "Cargo.toml", "src/**/*"]
 
 [dependencies]

diff --git a/bin/src/command/requests.rs b/bin/src/command/requests.rs
@@ -258,7 +258,6 @@ fn subscribe_client_to_events(server: &mut Server, client: &mut ClientSession) {
 #[derive(Debug)]
 pub struct QueryClustersTask {
     pub client_token: Token,
-    pub request_type: RequestType,
     pub gatherer: DefaultGatherer,
     main_process_response: Option<ResponseContent>,
 }
@@ -276,7 +275,6 @@ pub fn query_clusters(
             client_token: client.token,
             gatherer: DefaultGatherer::default(),
             main_process_response: server.query_main(request_content.clone()),
-            request_type: request_content,
         }),
         Timeout::Default,
         None,

diff --git a/command/Cargo.toml b/command/Cargo.toml
@@ -15,7 +15,7 @@ authors = [
 ]
 categories = ["network-programming"]
 edition = "2021"
-rust-version = "1.74.0"
+rust-version = "1.80.0"
 include = [
   "./README.md",
   "Cargo.toml",

diff --git a/command/src/response.rs b/command/src/response.rs
@@ -217,11 +217,6 @@ impl fmt::Display for RunState {
     }
 }
 
-#[derive(Serialize)]
-struct StatePath {
-    path: String,
-}
-
 pub type MessageId = String;
 
 impl WorkerResponse {

diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sozu-e2e"
 version = "1.0.1"
-rust-version = "1.74.0"
+rust-version = "1.80.0"
 edition = "2021"
 
 [dependencies]

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -16,7 +16,7 @@ authors = [
 ]
 categories = ["network-programming"]
 edition = "2021"
-rust-version = "1.74.0"
+rust-version = "1.80.0"
 include = [
   "./README.md",
   "Cargo.toml",
@@ -33,7 +33,7 @@ cookie-factory = "^0.3.3"
 hdrhistogram = "^7.5.4"
 hex = "^0.4.3"
 hpack = "^0.3.0"
-idna = "^0.5.0"
+idna = "^1.0.2"
 kawa = { version = "^0.6.6", default-features = false }
 libc = "^0.2.155"
 memchr = "^2.7.2"
@@ -50,8 +50,6 @@ slab = "^0.4.9"
 socket2 = { version = "^0.5.7", features = ["all"] }
 thiserror = "^1.0.61"
 time = "^0.3.36"
-once_cell = "1.19.0"
-
 sozu-command-lib = { path = "../command", version = "^1.0.4" }
 
 [dev-dependencies]

diff --git a/lib/src/https.rs b/lib/src/https.rs
@@ -76,13 +76,6 @@ use crate::{
 // const SERVER_PROTOS: &[&str] = &["http/1.1", "h2"];
 const SERVER_PROTOS: &[&str] = &["http/1.1"];
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct TlsCluster {
-    cluster_id: String,
-    hostname: String,
-    path_begin: String,
-}
-
 StateMachineBuilder! {
     /// The various Stages of an HTTPS connection:
     ///

diff --git a/lib/src/metrics/mod.rs b/lib/src/metrics/mod.rs
@@ -265,15 +265,6 @@ impl Subscriber for Aggregator {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct MetricLine {
-    label: &'static str,
-    cluster_id: Option<String>,
-    backend_id: Option<String>,
-    /// in milliseconds
-    duration: usize,
-}
-
 pub struct MetricSocket {
     pub addr: SocketAddr,
     pub socket: UdpSocket,

diff --git a/lib/src/timer.rs b/lib/src/timer.rs
@@ -639,7 +639,7 @@ mod test {
         let mut t = timer();
 
         t.set_timeout_at(Duration::from_millis(100), "a");
-        t.set_timeout_at(Duration::from_millis((100 + TICK * SLOTS as u64)), "b");
+        t.set_timeout_at(Duration::from_millis(100 + TICK * SLOTS as u64), "b");
 
         let mut tick = ms_to_tick(&t, 100);
         assert_eq!(Some("a"), t.poll_to(tick));

diff --git a/lib/src/tls.rs b/lib/src/tls.rs
@@ -10,10 +10,9 @@ use std::{
     fmt,
     io::BufReader,
     str::FromStr,
-    sync::{Arc, Mutex},
+    sync::{Arc, LazyLock, Mutex},
 };
 
-use once_cell::sync::Lazy;
 use rustls::{
     crypto::ring::sign::any_supported_type,
     pki_types::{CertificateDer, PrivateKeyDer},
@@ -33,7 +32,7 @@ use crate::router::trie::{Key, KeyValue, TrieNode};
 // -----------------------------------------------------------------------------
 // Default ParsedCertificateAndKey
 
-static DEFAULT_CERTIFICATE: Lazy<Option<Arc<CertifiedKey>>> = Lazy::new(|| {
+static DEFAULT_CERTIFICATE: LazyLock<Option<Arc<CertifiedKey>>> = LazyLock::new(|| {
     let add = AddCertificate {
         certificate: CertificateAndKey {
             certificate: include_str!("../assets/certificate.pem").to_string(),

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.74.0
+1.80.0