diff --git a/Tiltfile b/Tiltfile index 28cfedc46312b..40512dad775c7 100644 --- a/Tiltfile +++ b/Tiltfile @@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo') docker_build( ref='timberio/vector', context='.', - build_args={'RUST_VERSION': '1.81.0'}, + build_args={'RUST_VERSION': '1.82.0'}, dockerfile='tilt/Dockerfile' ) diff --git a/lib/vector-core/src/tls/incoming.rs b/lib/vector-core/src/tls/incoming.rs index ca1d1f7dbc185..d13c10717d8bc 100644 --- a/lib/vector-core/src/tls/incoming.rs +++ b/lib/vector-core/src/tls/incoming.rs @@ -28,14 +28,13 @@ use crate::tcp::{self, TcpKeepaliveConfig}; impl TlsSettings { pub fn acceptor(&self) -> crate::tls::Result { - match self.identity { - None => Err(TlsError::MissingRequiredIdentity), - Some(_) => { - let mut acceptor = SslAcceptor::mozilla_intermediate(SslMethod::tls()) - .context(CreateAcceptorSnafu)?; - self.apply_context_base(&mut acceptor, true)?; - Ok(acceptor.build()) - } + if self.identity.is_none() { + Err(TlsError::MissingRequiredIdentity) + } else { + let mut acceptor = + SslAcceptor::mozilla_intermediate(SslMethod::tls()).context(CreateAcceptorSnafu)?; + self.apply_context_base(&mut acceptor, true)?; + Ok(acceptor.build()) } } } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6f4d5bc316580..5fce226f0a8b7 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.81" +channel = "1.82" profile = "default"