From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/rust/audioipc2/src/codec.rs         | 2 +-
 third_party/rust/audioipc2/src/messages.rs      | 2 +-
 third_party/rust/audioipc2/src/sys/unix/cmsg.rs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'third_party/rust/audioipc2/src')

diff --git a/third_party/rust/audioipc2/src/codec.rs b/third_party/rust/audioipc2/src/codec.rs
index 2c61faa6ea..eb172fbc51 100644
--- a/third_party/rust/audioipc2/src/codec.rs
+++ b/third_party/rust/audioipc2/src/codec.rs
@@ -10,7 +10,7 @@
 // This should be fixed in Rust 1.68, after which the following `allow` can be deleted.
 #![allow(clippy::uninlined_format_args)]
 
-use bincode::{self, Options};
+use bincode::Options;
 use byteorder::{ByteOrder, LittleEndian};
 use bytes::{Buf, BufMut, BytesMut};
 use serde::de::DeserializeOwned;
diff --git a/third_party/rust/audioipc2/src/messages.rs b/third_party/rust/audioipc2/src/messages.rs
index 9ba9d8df3c..ef99bd4149 100644
--- a/third_party/rust/audioipc2/src/messages.rs
+++ b/third_party/rust/audioipc2/src/messages.rs
@@ -8,7 +8,7 @@ use crate::PlatformHandleType;
 use crate::INVALID_HANDLE_VALUE;
 #[cfg(target_os = "linux")]
 use audio_thread_priority::RtPriorityThreadInfo;
-use cubeb::{self, ffi};
+use cubeb::ffi;
 use serde_derive::Deserialize;
 use serde_derive::Serialize;
 use std::ffi::{CStr, CString};
diff --git a/third_party/rust/audioipc2/src/sys/unix/cmsg.rs b/third_party/rust/audioipc2/src/sys/unix/cmsg.rs
index 88a133772b..48f202957c 100644
--- a/third_party/rust/audioipc2/src/sys/unix/cmsg.rs
+++ b/third_party/rust/audioipc2/src/sys/unix/cmsg.rs
@@ -5,7 +5,7 @@
 
 use crate::sys::HANDLE_QUEUE_LIMIT;
 use bytes::{BufMut, BytesMut};
-use libc::{self, cmsghdr};
+use libc::cmsghdr;
 use std::convert::TryInto;
 use std::os::unix::io::RawFd;
 use std::{mem, slice};
-- 
cgit v1.2.3