Merge branch 'master' into master

RustAudio · Dec 2, 2024 · ed5f083 · ed5f083
2 parents 480fc8e + cd4df61
commit ed5f083
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/src/gl/win.rs b/src/gl/win.rs
@@ -160,6 +160,7 @@ impl GlContext {
             let symbol = CString::new("wglCreateContextAttribsARB").unwrap();
             let addr = wglGetProcAddress(symbol.as_ptr());
             if !addr.is_null() {
+                #[allow(clippy::missing_transmute_annotations)]
                 Some(std::mem::transmute(addr))
             } else {
                 None
@@ -171,6 +172,7 @@ impl GlContext {
             let symbol = CString::new("wglChoosePixelFormatARB").unwrap();
             let addr = wglGetProcAddress(symbol.as_ptr());
             if !addr.is_null() {
+                #[allow(clippy::missing_transmute_annotations)]
                 Some(std::mem::transmute(addr))
             } else {
                 None
@@ -182,6 +184,7 @@ impl GlContext {
             let symbol = CString::new("wglSwapIntervalEXT").unwrap();
             let addr = wglGetProcAddress(symbol.as_ptr());
             if !addr.is_null() {
+                #[allow(clippy::missing_transmute_annotations)]
                 Some(std::mem::transmute(addr))
             } else {
                 None

diff --git a/src/gl/x11.rs b/src/gl/x11.rs
@@ -91,6 +91,7 @@ impl GlContext {
                 if addr.is_null() {
                     return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
                 } else {
+                    #[allow(clippy::missing_transmute_annotations)]
                     std::mem::transmute(addr)
                 }
             };
@@ -101,6 +102,7 @@ impl GlContext {
                 if addr.is_null() {
                     return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
                 } else {
+                    #[allow(clippy::missing_transmute_annotations)]
                     std::mem::transmute(addr)
                 }
             };

diff --git a/src/macos/view.rs b/src/macos/view.rs
@@ -347,8 +347,6 @@ extern "C" fn view_will_move_to_window(this: &Object, _self: Sel, new_window: id
         let tracking_areas: *mut Object = msg_send![this, trackingAreas];
         let tracking_area_count = NSArray::count(tracking_areas);
 
-        let _: () = msg_send![class!(NSEvent), setMouseCoalescingEnabled: NO];
-
         if new_window == nil {
             if tracking_area_count != 0 {
                 let tracking_area = NSArray::objectAtIndex(tracking_areas, 0);

diff --git a/src/win/drop_target.rs b/src/win/drop_target.rs
@@ -47,6 +47,8 @@ const DROP_PTR: unsafe extern "system" fn(
     pt: POINTL,
     pdwEffect: *mut DWORD,
 ) -> HRESULT = DropTarget::drop;
+
+#[allow(clippy::missing_transmute_annotations)]
 const DROP_TARGET_VTBL: IDropTargetVtbl = IDropTargetVtbl {
     parent: IUnknownVtbl {
         QueryInterface: DropTarget::query_interface,
@@ -148,15 +150,9 @@ impl DropTarget {
             for i in 0..item_count {
                 let characters = DragQueryFileW(hdrop, i, null_mut(), 0);
                 let buffer_size = characters as usize + 1;
-                let mut buffer = Vec::<u16>::with_capacity(buffer_size);
-
-                DragQueryFileW(
-                    hdrop,
-                    i,
-                    buffer.spare_capacity_mut().as_mut_ptr().cast(),
-                    buffer_size as u32,
-                );
-                buffer.set_len(buffer_size);
+                let mut buffer = vec![0u16; buffer_size];
+
+                DragQueryFileW(hdrop, i, buffer.as_mut_ptr().cast(), buffer_size as u32);
 
                 paths.push(OsString::from_wide(&buffer[..characters as usize]).into())
             }