diff --git a/Cargo.toml b/Cargo.toml index 48fcfee6c0..683f610a66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ name = "sdl2" path = "src/sdl2/lib.rs" [dependencies] -bitflags = "1.2.1" +bitflags = "2.5" libc = "0.2.92" lazy_static = "1.4.0" @@ -30,9 +30,9 @@ version = ">= 1.0" optional = true [dev-dependencies] -rand = "0.7" -wgpu = { version = "0.20", features = ["spirv"] } -pollster = "0.2.4" +rand = "0.8" +wgpu = { version = "22.0.0", features = ["spirv"] } +pollster = "0.3" env_logger = "0.11.0" [dependencies.raw-window-handle] diff --git a/examples/audio-whitenoise.rs b/examples/audio-whitenoise.rs index 96d3005dfc..c7feace711 100644 --- a/examples/audio-whitenoise.rs +++ b/examples/audio-whitenoise.rs @@ -16,7 +16,7 @@ impl AudioCallback for MyCallback { // Generate white noise for x in out.iter_mut() { - *x = (rng.gen_range(0.0, 2.0) - 1.0) * self.volume; + *x = (rng.gen_range(0.0..2.0) - 1.0) * self.volume; } } } diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index 2044d00e6f..82b8993a6f 100644 --- a/sdl2-sys/Cargo.toml +++ b/sdl2-sys/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" libc = "^0.2" [build-dependencies.bindgen] -version = "^0.69" +version = "^0.70" optional = true [build-dependencies.pkg-config] @@ -40,7 +40,7 @@ version = "^1" optional = true [build-dependencies] -version-compare = "0.1" +version-compare = "0.2" cfg-if = "^1.0" [features] @@ -57,3 +57,7 @@ mixer = [] image = [] ttf = [] gfx = [] + +[lints.rust.unexpected_cfgs] +level = "warn" +check-cfg = ['cfg(mac_framework)', 'cfg(ios_framework)'] diff --git a/src/sdl2/image/mod.rs b/src/sdl2/image/mod.rs index 07cdb1cb8c..4afbde01ca 100644 --- a/src/sdl2/image/mod.rs +++ b/src/sdl2/image/mod.rs @@ -34,6 +34,7 @@ use version::Version; bitflags! { /// InitFlags are passed to init() to control which subsystem /// functionality to load. + #[derive(Clone, Copy)] pub struct InitFlag : u32 { const JPG = image::IMG_InitFlags_IMG_INIT_JPG; const PNG = image::IMG_InitFlags_IMG_INIT_PNG; diff --git a/src/sdl2/keyboard/mod.rs b/src/sdl2/keyboard/mod.rs index b276373daa..a0278ae222 100644 --- a/src/sdl2/keyboard/mod.rs +++ b/src/sdl2/keyboard/mod.rs @@ -17,6 +17,7 @@ pub use self::keycode::Keycode; pub use self::scancode::Scancode; bitflags! { + #[derive(Debug, Copy, Clone, PartialEq)] pub struct Mod: u16 { const NOMOD = 0x0000; const LSHIFTMOD = 0x0001; diff --git a/src/sdl2/messagebox.rs b/src/sdl2/messagebox.rs index 8eff0e20c7..0ace0db82e 100644 --- a/src/sdl2/messagebox.rs +++ b/src/sdl2/messagebox.rs @@ -24,6 +24,7 @@ bitflags! { } bitflags! { + #[derive(Debug)] pub struct MessageBoxButtonFlag: u32 { const ESCAPEKEY_DEFAULT = sys::SDL_MessageBoxButtonFlags::SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT as u32; diff --git a/src/sdl2/mixer/mod.rs b/src/sdl2/mixer/mod.rs index 8f87ad0426..f463683bd6 100644 --- a/src/sdl2/mixer/mod.rs +++ b/src/sdl2/mixer/mod.rs @@ -96,6 +96,7 @@ pub fn get_linked_version() -> Version { } bitflags!( + #[derive(Clone, Copy, Debug)] pub struct InitFlag : u32 { const FLAC = mixer::MIX_InitFlags_MIX_INIT_FLAC; const MOD = mixer::MIX_InitFlags_MIX_INIT_MOD;