Skip to content

Commit

Permalink
suppress dangerous clippy hints until rust-lang/rust-clippy#3992 is r…
Browse files Browse the repository at this point in the history
…esolved
  • Loading branch information
danielrh committed Aug 24, 2020
1 parent 1525769 commit eaa01c5
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/sdl2/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ macro_rules! impl_raw_accessors(
$(
impl $t {
#[inline]
// can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub const unsafe fn raw(&self) -> $raw { self.raw }
}
)+
Expand Down
7 changes: 6 additions & 1 deletion src/sdl2/rect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,9 @@ impl Rect {
}

/// Returns the underlying C Rect.
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *const sys::SDL_Rect {
&self.raw
}
Expand Down Expand Up @@ -738,7 +741,9 @@ impl Point {
pub fn raw_slice(slice: &[Point]) -> *const sys::SDL_Point {
slice.as_ptr() as *const sys::SDL_Point
}

// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *const sys::SDL_Point {
&self.raw
}
Expand Down
15 changes: 15 additions & 0 deletions src/sdl2/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,9 @@ impl<T> RendererContext<T> {
}

/// Gets the raw pointer to the SDL_Renderer
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *mut sys::SDL_Renderer {
self.raw
}
Expand Down Expand Up @@ -784,6 +787,9 @@ fn ll_create_texture(context: *mut sys::SDL_Renderer,

/// Texture-creating methods for the renderer
impl<T> TextureCreator<T> {
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *mut sys::SDL_Renderer {
self.context.raw()
}
Expand Down Expand Up @@ -922,6 +928,9 @@ impl<T> TextureCreator<T> {

/// Drawing methods
impl<T: RenderTarget> Canvas<T> {
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *mut sys::SDL_Renderer {
self.context.raw()
}
Expand Down Expand Up @@ -2148,6 +2157,9 @@ impl<'r> Texture<'r> {
}

#[inline]
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub const fn raw(&self) -> *mut sys::SDL_Texture {
self.raw
}
Expand Down Expand Up @@ -2328,6 +2340,9 @@ impl<> Texture<> {
}

#[inline]
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub const fn raw(&self) -> *mut sys::SDL_Texture {
self.raw
}
Expand Down
3 changes: 3 additions & 0 deletions src/sdl2/rwops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ pub struct RWops<'a> {
}

impl<'a> RWops<'a> {
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub unsafe fn raw(&self) -> *mut sys::SDL_RWops { self.raw }

pub unsafe fn from_ll<'b>(raw: *mut sys::SDL_RWops) -> RWops<'b> {
Expand Down
3 changes: 3 additions & 0 deletions src/sdl2/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@ impl SurfaceRef {
}

#[inline]
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *mut sys::SDL_Surface {
self as *const SurfaceRef as *mut SurfaceRef as *mut () as *mut sys::SDL_Surface
}
Expand Down
3 changes: 3 additions & 0 deletions src/sdl2/ttf/font.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,9 @@ pub fn internal_load_font_at_index<'ttf,P: AsRef<Path>>(path: P, index: u32, pts

impl<'ttf,'r> Font<'ttf,'r> {
/// Returns the underlying C font object.
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
unsafe fn raw(&self) -> *mut ttf::TTF_Font {
self.raw
}
Expand Down
3 changes: 3 additions & 0 deletions src/sdl2/video.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1075,6 +1075,9 @@ impl From<Window> for CanvasBuilder {

impl Window {
#[inline]
// this can prevent introducing UB until
// https://github.com/rust-lang/rust-clippy/issues/3992 is fixed
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn raw(&self) -> *mut sys::SDL_Window { self.context.raw }

#[inline]
Expand Down

0 comments on commit eaa01c5

Please sign in to comment.