Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump outdated dependencies #1429

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion examples/audio-whitenoise.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions sdl2-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -40,7 +40,7 @@ version = "^1"
optional = true

[build-dependencies]
version-compare = "0.1"
version-compare = "0.2"
cfg-if = "^1.0"

[features]
Expand All @@ -57,3 +57,7 @@ mixer = []
image = []
ttf = []
gfx = []

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(mac_framework)', 'cfg(ios_framework)']
1 change: 1 addition & 0 deletions src/sdl2/image/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/sdl2/keyboard/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/sdl2/messagebox.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/sdl2/mixer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading