Skip to content

Commit b4abd65

Browse files
chore: Fix more unused_qualifications (#5746)
1 parent 7368e51 commit b4abd65

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

wgpu-hal/src/gles/egl.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,17 +1226,15 @@ impl crate::Surface for Surface {
12261226
let native_window_ptr = match (self.wsi.kind, self.raw_window_handle) {
12271227
(WindowKind::Unknown | WindowKind::X11, Rwh::Xlib(handle)) => {
12281228
temp_xlib_handle = handle.window;
1229-
&mut temp_xlib_handle as *mut _ as *mut std::ffi::c_void
1230-
}
1231-
(WindowKind::AngleX11, Rwh::Xlib(handle)) => {
1232-
handle.window as *mut std::ffi::c_void
1229+
&mut temp_xlib_handle as *mut _ as *mut ffi::c_void
12331230
}
1231+
(WindowKind::AngleX11, Rwh::Xlib(handle)) => handle.window as *mut ffi::c_void,
12341232
(WindowKind::Unknown | WindowKind::X11, Rwh::Xcb(handle)) => {
12351233
temp_xcb_handle = handle.window;
1236-
&mut temp_xcb_handle as *mut _ as *mut std::ffi::c_void
1234+
&mut temp_xcb_handle as *mut _ as *mut ffi::c_void
12371235
}
12381236
(WindowKind::AngleX11, Rwh::Xcb(handle)) => {
1239-
handle.window.get() as *mut std::ffi::c_void
1237+
handle.window.get() as *mut ffi::c_void
12401238
}
12411239
(WindowKind::Unknown, Rwh::AndroidNdk(handle)) => {
12421240
handle.a_native_window.as_ptr()
@@ -1252,9 +1250,9 @@ impl crate::Surface for Surface {
12521250
window
12531251
}
12541252
#[cfg(Emscripten)]
1255-
(WindowKind::Unknown, Rwh::Web(handle)) => handle.id as *mut std::ffi::c_void,
1253+
(WindowKind::Unknown, Rwh::Web(handle)) => handle.id as *mut ffi::c_void,
12561254
(WindowKind::Unknown, Rwh::Win32(handle)) => {
1257-
handle.hwnd.get() as *mut std::ffi::c_void
1255+
handle.hwnd.get() as *mut ffi::c_void
12581256
}
12591257
(WindowKind::Unknown, Rwh::AppKit(handle)) => {
12601258
#[cfg(not(target_os = "macos"))]

wgpu-hal/src/metal/adapter.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,9 @@ impl crate::Adapter for super::Adapter {
8282
// https://developer.apple.com/documentation/metal/mtlreadwritetexturetier/mtlreadwritetexturetier1?language=objc
8383
// https://developer.apple.com/documentation/metal/mtlreadwritetexturetier/mtlreadwritetexturetier2?language=objc
8484
let (read_write_tier1_if, read_write_tier2_if) = match pc.read_write_texture_tier {
85-
metal::MTLReadWriteTextureTier::TierNone => (Tfc::empty(), Tfc::empty()),
86-
metal::MTLReadWriteTextureTier::Tier1 => (Tfc::STORAGE_READ_WRITE, Tfc::empty()),
87-
metal::MTLReadWriteTextureTier::Tier2 => {
88-
(Tfc::STORAGE_READ_WRITE, Tfc::STORAGE_READ_WRITE)
89-
}
85+
MTLReadWriteTextureTier::TierNone => (Tfc::empty(), Tfc::empty()),
86+
MTLReadWriteTextureTier::Tier1 => (Tfc::STORAGE_READ_WRITE, Tfc::empty()),
87+
MTLReadWriteTextureTier::Tier2 => (Tfc::STORAGE_READ_WRITE, Tfc::STORAGE_READ_WRITE),
9088
};
9189
let msaa_count = pc.sample_count_mask;
9290

0 commit comments

Comments
 (0)