From 43756c24394004254c20cc2d12a940db0750f179 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Mon, 29 Apr 2024 23:32:59 +0700 Subject: [PATCH 1/7] bump version-compare to v0.2 --- sdl2-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index 2044d00e6f..5495dd6374 100644 --- a/sdl2-sys/Cargo.toml +++ b/sdl2-sys/Cargo.toml @@ -40,7 +40,7 @@ version = "^1" optional = true [build-dependencies] -version-compare = "0.1" +version-compare = "0.2" cfg-if = "^1.0" [features] From 170586eb2a802f54e6a01e688349e17fd9af6eec Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 30 Apr 2024 00:31:30 +0700 Subject: [PATCH 2/7] bump bitflags to 2.5 --- Cargo.toml | 2 +- src/sdl2/keyboard/mod.rs | 1 + src/sdl2/messagebox.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 48fcfee6c0..4e6d9a66f8 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" 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; From 02464ab06c74f8672c15b9d7fea3afd066077ecc Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 30 Apr 2024 00:38:20 +0700 Subject: [PATCH 3/7] bump rand to 0.8 --- Cargo.toml | 2 +- examples/audio-whitenoise.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4e6d9a66f8..9464ff243c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ version = ">= 1.0" optional = true [dev-dependencies] -rand = "0.7" +rand = "0.8" wgpu = { version = "0.20", features = ["spirv"] } pollster = "0.2.4" env_logger = "0.11.0" 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; } } } From 84b8063607524957a9bac91e05ba8be124e4aa3d Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Tue, 30 Apr 2024 00:47:19 +0700 Subject: [PATCH 4/7] bump pollster to 0.3 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9464ff243c..ff1fdc972d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ optional = true [dev-dependencies] rand = "0.8" wgpu = { version = "0.20", features = ["spirv"] } -pollster = "0.2.4" +pollster = "0.3" env_logger = "0.11.0" [dependencies.raw-window-handle] From 8d3e05c6bc2cacc993554dacc2e9bec7a6107c39 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Mon, 9 Sep 2024 00:31:25 +0700 Subject: [PATCH 5/7] Fix warning: unexpected `cfg` condition name: `ios_framework` --- sdl2-sys/Cargo.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index 5495dd6374..035b11fb86 100644 --- a/sdl2-sys/Cargo.toml +++ b/sdl2-sys/Cargo.toml @@ -57,3 +57,7 @@ mixer = [] image = [] ttf = [] gfx = [] + +[lints.rust.unexpected_cfgs] +level = "warn" +check-cfg = ['cfg(mac_framework)', 'cfg(ios_framework)'] From 2e0f368764c8441677a76b95fd81fb4f3342bad4 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Mon, 9 Sep 2024 00:36:55 +0700 Subject: [PATCH 6/7] Bump wgpu to major release: 22.0.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ff1fdc972d..683f610a66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ optional = true [dev-dependencies] rand = "0.8" -wgpu = { version = "0.20", features = ["spirv"] } +wgpu = { version = "22.0.0", features = ["spirv"] } pollster = "0.3" env_logger = "0.11.0" From de0da0a10234fee28b305dd61fc7b613933d2347 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Mon, 9 Sep 2024 00:27:44 +0700 Subject: [PATCH 7/7] Bump bindgen to 0.70 --- sdl2-sys/Cargo.toml | 2 +- src/sdl2/image/mod.rs | 1 + src/sdl2/mixer/mod.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml index 035b11fb86..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] 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/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;