diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/rust/audioipc2-server/src | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/rust/audioipc2-server/src/lib.rs | 4 | ||||
-rw-r--r-- | third_party/rust/audioipc2-server/src/server.rs | 2 |
2 files changed, 3 insertions, 3 deletions
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<Mutex<CubebContextParams>> = 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}; |