diff --git a/src/conf.rs b/src/conf.rs index 65270c49..a352cfcb 100644 --- a/src/conf.rs +++ b/src/conf.rs @@ -71,7 +71,7 @@ pub enum AppleGfxApi { #[derive(Debug, PartialEq, Clone, Copy)] pub enum WebGLVersion { WebGL1, - WebGL2 + WebGL2, } /// Platform specific settings. diff --git a/src/event.rs b/src/event.rs index 98b44de1..a702f86c 100644 --- a/src/event.rs +++ b/src/event.rs @@ -179,7 +179,6 @@ pub trait EventHandler { fn key_down_event(&mut self, _keycode: KeyCode, _keymods: KeyMods, _repeat: bool) {} - fn key_up_event(&mut self, _keycode: KeyCode, _keymods: KeyMods) {} /// Default implementation emulates mouse clicks diff --git a/src/graphics/metal.rs b/src/graphics/metal.rs index b97b653e..4d75ad7e 100644 --- a/src/graphics/metal.rs +++ b/src/graphics/metal.rs @@ -254,7 +254,7 @@ struct Textures(Vec); impl Textures { fn get(&self, texture: TextureId) -> Texture { match texture.0 { - TextureIdInner::Raw(RawId::Metal(texture)) => unimplemented!(), + TextureIdInner::Raw(RawId::Metal(_texture)) => unimplemented!(), TextureIdInner::Raw(RawId::OpenGl(_)) => panic!("Gl texture in Metal context!"), TextureIdInner::Managed(texture) => self.0[texture], } @@ -262,7 +262,7 @@ impl Textures { fn get_mut(&mut self, texture: TextureId) -> &mut Texture { match texture.0 { - TextureIdInner::Raw(RawId::Metal(texture)) => unimplemented!(), + TextureIdInner::Raw(RawId::Metal(_texture)) => unimplemented!(), TextureIdInner::Raw(RawId::OpenGl(_)) => panic!("Gl texture in Metal context!"), TextureIdInner::Managed(texture) => &mut self.0[texture], } @@ -632,7 +632,7 @@ impl RenderingBackend for MetalContext { BufferSource::Slice(data) => data, _ => panic!("buffer_update expects BufferSource::slice"), }; - let mut buffer = &mut self.buffers[buffer.0]; + let buffer = &mut self.buffers[buffer.0]; assert!(data.size <= buffer.size); unsafe { @@ -1068,7 +1068,7 @@ impl RenderingBackend for MetalContext { atIndex:(index + 1) as u64]; buffer.next_value = buffer.value + 1; } - let mut index_buffer = &mut self.buffers[index_buffer.0]; + let index_buffer = &mut self.buffers[index_buffer.0]; self.index_buffer = Some(index_buffer.raw[index_buffer.value]); index_buffer.next_value = index_buffer.value + 1; @@ -1249,10 +1249,10 @@ impl RenderingBackend for MetalContext { } } - fn delete_shader(&mut self, shader: ShaderId) { + fn delete_shader(&mut self, _shader: ShaderId) { // TODO: place holder } - fn delete_pipeline(&mut self, pipeline: Pipeline) { + fn delete_pipeline(&mut self, _pipeline: Pipeline) { // TODO: place holder } diff --git a/src/native/apple/frameworks.rs b/src/native/apple/frameworks.rs index 3a30880d..5f0de3c4 100644 --- a/src/native/apple/frameworks.rs +++ b/src/native/apple/frameworks.rs @@ -158,7 +158,7 @@ pub const kCGEventLeftMouseUp: u32 = 2; pub const kCGMouseEventClickState: u32 = 1; //pub const kCGEventSourceStateHIDSystemState: u32 = 1; -type DataReleaseCallback = unsafe extern "C" fn(info: *mut &[u8], data: *const c_void, size: usize); +type DataReleaseCallback = unsafe extern "C" fn(*mut c_void, *const c_void, usize); #[link(name = "CoreGraphics", kind = "framework")] extern "C" { @@ -209,7 +209,7 @@ extern "C" { pub fn CGImageRelease(image: *const ObjcId); pub fn CGDataProviderCreateWithData( - info: *mut &[u8], + info: *mut c_void, data: *const u8, size: usize, callback: DataReleaseCallback, @@ -220,7 +220,7 @@ extern "C" { pub fn CGColorSpaceRelease(space: *const ObjcId); } -pub const kCGBitmapByteOrderDefault: u32 = (0 << 12); +pub const kCGBitmapByteOrderDefault: u32 = 0 << 12; pub const kCGImageAlphaLast: u32 = 3; pub const kCGRenderingIntentDefault: u32 = 0; diff --git a/src/native/macos.rs b/src/native/macos.rs index 59699ecf..fa32602d 100644 --- a/src/native/macos.rs +++ b/src/native/macos.rs @@ -134,7 +134,7 @@ impl MacosDisplay { (new_x, new_y) } - fn move_mouse_inside_window(&self, window: *mut Object) { + fn move_mouse_inside_window(&self, _window: *mut Object) { unsafe { let frame: NSRect = msg_send![self.window, frame]; let origin = self.transform_mouse_point(&frame.origin); @@ -173,24 +173,22 @@ impl MacosDisplay { fn process_request(&mut self, request: Request) { use Request::*; - unsafe { - match request { - ScheduleUpdate => { - self.update_requested = true; - } - SetCursorGrab(grab) => self.set_cursor_grab(self.window, grab), - ShowMouse(show) => self.show_mouse(show), - SetMouseCursor(icon) => self.set_mouse_cursor(icon), - SetWindowSize { - new_width, - new_height, - } => self.set_window_size(new_width as _, new_height as _), - SetFullscreen(fullscreen) => self.set_fullscreen(fullscreen), - SetWindowPosition { new_x, new_y } => { - eprintln!("Not implemented for macos"); - } - _ => {} + match request { + ScheduleUpdate => { + self.update_requested = true; } + SetCursorGrab(grab) => self.set_cursor_grab(self.window, grab), + ShowMouse(show) => self.show_mouse(show), + SetMouseCursor(icon) => self.set_mouse_cursor(icon), + SetWindowSize { + new_width, + new_height, + } => self.set_window_size(new_width as _, new_height as _), + SetFullscreen(fullscreen) => self.set_fullscreen(fullscreen), + SetWindowPosition { .. } => { + eprintln!("Not implemented for macos"); + } + _ => {} } } } @@ -737,7 +735,7 @@ pub fn define_metal_view_class() -> *const Class { payload.event_handler = Some(f()); } - let mut updated = false; + let mut updated = false; if let Some(event_handler) = payload.context() { event_handler.update(); @@ -855,8 +853,8 @@ impl crate::native::Clipboard for MacosClipboard { fn set(&mut self, _data: &str) {} } -unsafe extern "C" fn release_data(info: *mut &[u8], _: *const c_void, _: usize) { - Box::from_raw(info); +unsafe extern "C" fn release_data(info: *mut c_void, _: *const c_void, _: usize) { + drop(Box::from_raw(info)); } unsafe fn set_icon(ns_app: ObjcId, icon: &Icon) { @@ -872,7 +870,7 @@ unsafe fn set_icon(ns_app: ObjcId, icon: &Icon) { let size = colors.len(); let boxed = Box::new(colors); let info = Box::into_raw(boxed); - let provider = CGDataProviderCreateWithData(info, data, size, release_data); + let provider = CGDataProviderCreateWithData(info as *mut c_void, data, size, release_data); let image = CGImageCreate( width, height, @@ -1021,7 +1019,7 @@ where display.process_request(request); } - unsafe { + { let d = native_display().lock().unwrap(); if d.quit_requested || d.quit_ordered { done = true;