diff --git a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA index a122f012a6aa..614ccab7d344 100644 --- a/media/libcubeb/cubeb-pulse-rs/README_MOZILLA +++ b/media/libcubeb/cubeb-pulse-rs/README_MOZILLA @@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system. The cubeb-pulse-rs git repository is: https://github.com/djg/cubeb-pulse-rs.git -The git commit ID used was 17c1629c323ff24d656ff9449bf50d6758aafc1a (2019-01-24 07:50:09 +1300) +The git commit ID used was 9d1c1292a11cf90f9450a97a1aa4604849263c45 (2019-07-11 09:49:33 +1200) diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs b/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs index c9b8a3a9609c..356304bb5a51 100644 --- a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs +++ b/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/context.rs @@ -6,6 +6,7 @@ use ::*; use ffi; use std::ffi::CStr; +use std::mem::{forget, MaybeUninit}; use std::os::raw::{c_int, c_void}; use std::ptr; use util::UnwrapCStr; @@ -95,15 +96,15 @@ impl Context { pub fn set_state_callback(&self, _: CB, userdata: *mut c_void) where CB: Fn(&Context, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, userdata: *mut c_void) where F: Fn(&Context, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, userdata); forget(ctx); result @@ -146,15 +147,15 @@ impl Context { pub fn drain(&self, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, userdata: *mut c_void) where F: Fn(&Context, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, userdata); forget(ctx); result @@ -167,7 +168,7 @@ impl Context { pub fn rttime_new(&self, usec: USec, _: CB, userdata: *mut c_void) -> *mut ffi::pa_time_event where CB: Fn(&MainloopApi, *mut ffi::pa_time_event, &TimeVal, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(a: *mut ffi::pa_mainloop_api, @@ -176,10 +177,10 @@ impl Context { userdata: *mut c_void) where F: Fn(&MainloopApi, *mut ffi::pa_time_event, &TimeVal, *mut c_void) { - use std::mem::{forget, uninitialized}; let api = mainloop_api::from_raw_ptr(a); let timeval = &*tv; - let result = uninitialized::()(&api, e, timeval, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&api, e, timeval, userdata); forget(api); result @@ -191,20 +192,20 @@ impl Context { pub fn get_server_info(&self, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, Option<&ServerInfo>, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, i: *const ffi::pa_server_info, userdata: *mut c_void) where F: Fn(&Context, Option<&ServerInfo>, *mut c_void) { - use std::mem::{forget, uninitialized}; let info = if i.is_null() { None } else { Some(&*i) }; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, info, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, info, userdata); forget(ctx); result @@ -219,7 +220,7 @@ impl Context { CB: Fn(&Context, *const SinkInfo, i32, *mut c_void), CS: Into>, { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, @@ -228,9 +229,9 @@ impl Context { userdata: *mut c_void) where F: Fn(&Context, *const SinkInfo, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, info, eol, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, info, eol, userdata); forget(ctx); result @@ -246,7 +247,7 @@ impl Context { pub fn get_sink_info_list(&self, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, *const SinkInfo, i32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, @@ -255,9 +256,9 @@ impl Context { userdata: *mut c_void) where F: Fn(&Context, *const SinkInfo, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, info, eol, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, info, eol, userdata); forget(ctx); result @@ -270,7 +271,7 @@ impl Context { pub fn get_sink_input_info(&self, idx: u32, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, *const SinkInputInfo, i32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, @@ -279,9 +280,9 @@ impl Context { userdata: *mut c_void) where F: Fn(&Context, *const SinkInputInfo, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, info, eol, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, info, eol, userdata); forget(ctx); result @@ -294,7 +295,7 @@ impl Context { pub fn get_source_info_list(&self, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, *const SourceInfo, i32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, @@ -303,9 +304,9 @@ impl Context { userdata: *mut c_void) where F: Fn(&Context, *const SourceInfo, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, info, eol, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, info, eol, userdata); forget(ctx); result @@ -323,15 +324,15 @@ impl Context { -> Result where CB: Fn(&Context, i32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, success: c_int, userdata: *mut c_void) where F: Fn(&Context, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, success, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, success, userdata); forget(ctx); result @@ -344,15 +345,15 @@ impl Context { pub fn subscribe(&self, m: SubscriptionMask, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Context, i32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, success: c_int, userdata: *mut c_void) where F: Fn(&Context, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); - let result = uninitialized::()(&ctx, success, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, success, userdata); forget(ctx); result @@ -371,7 +372,7 @@ impl Context { pub fn set_subscribe_callback(&self, _: CB, userdata: *mut c_void) where CB: Fn(&Context, SubscriptionEvent, u32, *mut c_void) { - debug_assert_eq!(::std::mem::size_of::(), 0); + assert_eq!(::std::mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(c: *mut ffi::pa_context, @@ -380,11 +381,11 @@ impl Context { userdata: *mut c_void) where F: Fn(&Context, SubscriptionEvent, u32, *mut c_void) { - use std::mem::{forget, uninitialized}; let ctx = context::from_raw_ptr(c); let event = SubscriptionEvent::try_from(t) .expect("pa_context_subscribe_cb_t passed invalid pa_subscription_event_type_t"); - let result = uninitialized::()(&ctx, event, idx, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&ctx, event, idx, userdata); forget(ctx); result diff --git a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs b/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs index 785ee1be485d..52440c7b3cde 100644 --- a/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs +++ b/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/stream.rs @@ -8,7 +8,7 @@ use context; use ffi; use operation; use std::ffi::CStr; -use std::mem; +use std::mem::{self, forget, MaybeUninit}; use std::os::raw::{c_int, c_void}; use std::ptr; use util::*; @@ -184,15 +184,15 @@ impl Stream { pub fn update_timing_info(&self, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Stream, i32, *mut c_void) { - debug_assert_eq!(mem::size_of::(), 0); + assert_eq!(mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(s: *mut ffi::pa_stream, success: c_int, userdata: *mut c_void) where F: Fn(&Stream, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let mut stm = stream::from_raw_ptr(s); - let result = uninitialized::()(&mut stm, success, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&mut stm, success, userdata); forget(stm); result @@ -219,15 +219,15 @@ impl Stream { pub fn set_state_callback(&self, _: CB, userdata: *mut c_void) where CB: Fn(&Stream, *mut c_void) { - debug_assert_eq!(mem::size_of::(), 0); + assert_eq!(mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(s: *mut ffi::pa_stream, userdata: *mut c_void) where F: Fn(&Stream, *mut c_void) { - use std::mem::{forget, uninitialized}; let mut stm = stream::from_raw_ptr(s); - let result = uninitialized::()(&mut stm, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&mut stm, userdata); forget(stm); result @@ -247,15 +247,15 @@ impl Stream { pub fn set_write_callback(&self, _: CB, userdata: *mut c_void) where CB: Fn(&Stream, usize, *mut c_void) { - debug_assert_eq!(mem::size_of::(), 0); + assert_eq!(mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(s: *mut ffi::pa_stream, nbytes: usize, userdata: *mut c_void) where F: Fn(&Stream, usize, *mut c_void) { - use std::mem::{forget, uninitialized}; let mut stm = stream::from_raw_ptr(s); - let result = uninitialized::()(&mut stm, nbytes, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&mut stm, nbytes, userdata); forget(stm); result @@ -275,15 +275,15 @@ impl Stream { pub fn set_read_callback(&self, _: CB, userdata: *mut c_void) where CB: Fn(&Stream, usize, *mut c_void) { - debug_assert_eq!(mem::size_of::(), 0); + assert_eq!(mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(s: *mut ffi::pa_stream, nbytes: usize, userdata: *mut c_void) where F: Fn(&Stream, usize, *mut c_void) { - use std::mem::{forget, uninitialized}; let mut stm = stream::from_raw_ptr(s); - let result = uninitialized::()(&mut stm, nbytes, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&mut stm, nbytes, userdata); forget(stm); result @@ -297,15 +297,15 @@ impl Stream { pub fn cork(&self, b: i32, _: CB, userdata: *mut c_void) -> Result where CB: Fn(&Stream, i32, *mut c_void) { - debug_assert_eq!(mem::size_of::(), 0); + assert_eq!(mem::size_of::(), 0); // See: A note about `wrapped` functions unsafe extern "C" fn wrapped(s: *mut ffi::pa_stream, success: c_int, userdata: *mut c_void) where F: Fn(&Stream, i32, *mut c_void) { - use std::mem::{forget, uninitialized}; let mut stm = stream::from_raw_ptr(s); - let result = uninitialized::()(&mut stm, success, userdata); + let cb = MaybeUninit::::uninit(); + let result = (*cb.as_ptr())(&mut stm, success, userdata); forget(stm); result