From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- third_party/rust/audioipc2-server/src/lib.rs | 4 ++-- third_party/rust/audioipc2-server/src/server.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/rust/audioipc2-server/src') diff --git a/third_party/rust/audioipc2-server/src/lib.rs b/third_party/rust/audioipc2-server/src/lib.rs index c90de38c66..05396e8e29 100644 --- a/third_party/rust/audioipc2-server/src/lib.rs +++ b/third_party/rust/audioipc2-server/src/lib.rs @@ -35,8 +35,8 @@ static G_CUBEB_CONTEXT_PARAMS: Lazy> = Lazy::new(|| { }); #[allow(deprecated)] +#[allow(clippy::upper_case_acronyms)] pub mod errors { - #![allow(clippy::upper_case_acronyms)] error_chain! { links { AudioIPC(::audioipc::errors::Error, ::audioipc::errors::ErrorKind); @@ -159,7 +159,7 @@ pub unsafe extern "C" fn audioipc2_server_start( assert!(!init_params.is_null()); let mut params = G_CUBEB_CONTEXT_PARAMS.lock().unwrap(); if !context_name.is_null() { - params.context_name = CStr::from_ptr(context_name).to_owned(); + CStr::from_ptr(context_name).clone_into(&mut params.context_name); } if !backend_name.is_null() { let backend_string = CStr::from_ptr(backend_name).to_owned(); diff --git a/third_party/rust/audioipc2-server/src/server.rs b/third_party/rust/audioipc2-server/src/server.rs index 256540a6fd..96a8fc3883 100644 --- a/third_party/rust/audioipc2-server/src/server.rs +++ b/third_party/rust/audioipc2-server/src/server.rs @@ -16,7 +16,7 @@ use audioipc::{ipccore, rpccore, sys, PlatformHandle}; use cubeb::InputProcessingParams; use cubeb_core as cubeb; use cubeb_core::ffi; -use std::convert::{From, TryInto}; +use std::convert::TryInto; use std::ffi::CStr; use std::mem::size_of; use std::os::raw::{c_long, c_void}; -- cgit v1.2.3