update impl<T> UniqueID to use correct return type

georglauterbach · gumpt · drcaramelsyrup · commit 1756948df77d · 2024-11-22T16:03:16.000-08:00
Includes-commit: d26d344 Replicated-from: #471 Co-authored-by: Matthew Gumport <mbg@cloudflare.com>
diff --git a/.bleep b/.bleep
@@ -1 +1 @@
-ab4b4c023bc3b26dfe253cf43ce410ccd76a6b27
+4cba0f37f5682058c05904a3c5a395919a8ac498
diff --git a/pingora-core/src/protocols/tls/rustls/stream.rs b/pingora-core/src/protocols/tls/rustls/stream.rs
@@ -21,7 +21,7 @@ use std::time::{Duration, SystemTime};
 
 use crate::listeners::tls::Acceptor;
 use crate::protocols::raw_connect::ProxyDigest;
-use crate::protocols::{tls::SslDigest, Peek, TimingDigest};
+use crate::protocols::{tls::SslDigest, Peek, TimingDigest, UniqueIDType};
 use crate::protocols::{
     GetProxyDigest, GetSocketDigest, GetTimingDigest, SocketDigest, Ssl, UniqueID, ALPN,
 };
@@ -216,7 +216,7 @@ impl<T> UniqueID for TlsStream<T>
 where
     T: UniqueID,
 {
-    fn id(&self) -> i32 {
+    fn id(&self) -> UniqueIDType {
         self.tls.stream.as_ref().unwrap().get_ref().0.id()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ use std::time::{Duration, SystemTime};`
`21`	`21`
`22`	`22`	`use crate::listeners::tls::Acceptor;`
`23`	`23`	`use crate::protocols::raw_connect::ProxyDigest;`
`24`		`-use crate::protocols::{tls::SslDigest, Peek, TimingDigest};`
	`24`	`+use crate::protocols::{tls::SslDigest, Peek, TimingDigest, UniqueIDType};`
`25`	`25`	`use crate::protocols::{`
`26`	`26`	`GetProxyDigest, GetSocketDigest, GetTimingDigest, SocketDigest, Ssl, UniqueID, ALPN,`
`27`	`27`	`};`
`@@ -216,7 +216,7 @@ impl<T> UniqueID for TlsStream<T>`
`216`	`216`	`where`
`217`	`217`	`T: UniqueID,`
`218`	`218`	`{`
`219`		`- fn id(&self) -> i32 {`
	`219`	`+ fn id(&self) -> UniqueIDType {`
`220`	`220`	`self.tls.stream.as_ref().unwrap().get_ref().0.id()`
`221`	`221`	`}`
`222`	`222`	`}`