Skip to content

Commit ed5f083

Browse files
authored
Merge branch 'master' into master
2 parents 480fc8e + cd4df61 commit ed5f083

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

src/gl/win.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ impl GlContext {
160160
let symbol = CString::new("wglCreateContextAttribsARB").unwrap();
161161
let addr = wglGetProcAddress(symbol.as_ptr());
162162
if !addr.is_null() {
163+
#[allow(clippy::missing_transmute_annotations)]
163164
Some(std::mem::transmute(addr))
164165
} else {
165166
None
@@ -171,6 +172,7 @@ impl GlContext {
171172
let symbol = CString::new("wglChoosePixelFormatARB").unwrap();
172173
let addr = wglGetProcAddress(symbol.as_ptr());
173174
if !addr.is_null() {
175+
#[allow(clippy::missing_transmute_annotations)]
174176
Some(std::mem::transmute(addr))
175177
} else {
176178
None
@@ -182,6 +184,7 @@ impl GlContext {
182184
let symbol = CString::new("wglSwapIntervalEXT").unwrap();
183185
let addr = wglGetProcAddress(symbol.as_ptr());
184186
if !addr.is_null() {
187+
#[allow(clippy::missing_transmute_annotations)]
185188
Some(std::mem::transmute(addr))
186189
} else {
187190
None

src/gl/x11.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ impl GlContext {
9191
if addr.is_null() {
9292
return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
9393
} else {
94+
#[allow(clippy::missing_transmute_annotations)]
9495
std::mem::transmute(addr)
9596
}
9697
};
@@ -101,6 +102,7 @@ impl GlContext {
101102
if addr.is_null() {
102103
return Err(GlError::CreationFailed(CreationFailedError::GetProcAddressFailed));
103104
} else {
105+
#[allow(clippy::missing_transmute_annotations)]
104106
std::mem::transmute(addr)
105107
}
106108
};

src/macos/view.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,6 @@ extern "C" fn view_will_move_to_window(this: &Object, _self: Sel, new_window: id
347347
let tracking_areas: *mut Object = msg_send![this, trackingAreas];
348348
let tracking_area_count = NSArray::count(tracking_areas);
349349

350-
let _: () = msg_send![class!(NSEvent), setMouseCoalescingEnabled: NO];
351-
352350
if new_window == nil {
353351
if tracking_area_count != 0 {
354352
let tracking_area = NSArray::objectAtIndex(tracking_areas, 0);

src/win/drop_target.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ const DROP_PTR: unsafe extern "system" fn(
4747
pt: POINTL,
4848
pdwEffect: *mut DWORD,
4949
) -> HRESULT = DropTarget::drop;
50+
51+
#[allow(clippy::missing_transmute_annotations)]
5052
const DROP_TARGET_VTBL: IDropTargetVtbl = IDropTargetVtbl {
5153
parent: IUnknownVtbl {
5254
QueryInterface: DropTarget::query_interface,
@@ -148,15 +150,9 @@ impl DropTarget {
148150
for i in 0..item_count {
149151
let characters = DragQueryFileW(hdrop, i, null_mut(), 0);
150152
let buffer_size = characters as usize + 1;
151-
let mut buffer = Vec::<u16>::with_capacity(buffer_size);
152-
153-
DragQueryFileW(
154-
hdrop,
155-
i,
156-
buffer.spare_capacity_mut().as_mut_ptr().cast(),
157-
buffer_size as u32,
158-
);
159-
buffer.set_len(buffer_size);
153+
let mut buffer = vec![0u16; buffer_size];
154+
155+
DragQueryFileW(hdrop, i, buffer.as_mut_ptr().cast(), buffer_size as u32);
160156

161157
paths.push(OsString::from_wide(&buffer[..characters as usize]).into())
162158
}

0 commit comments

Comments
 (0)