Bump edition to 2024, MSRV to 1.85

Author: crumblingstatue

.github/workflows/linux.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
     - uses: hecrj/setup-rust-action@v2
       with:
-        rust-version: 1.82.0
+        rust-version: 1.85.0
     - uses: actions/checkout@v4
     - name: Install deps
       run: |

.github/workflows/macos.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
     - uses: hecrj/setup-rust-action@v2
       with:
-        rust-version: 1.82.0
+        rust-version: 1.85.0
     - uses: actions/checkout@v4
     - name: Install deps
       run: |

.github/workflows/windows.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: hecrj/setup-rust-action@v2
       with:
-        rust-version: 1.82.0
+        rust-version: 1.85.0
     - uses: actions/checkout@v4
     - name: Build
       run: |

Cargo.toml

@@ -8,8 +8,8 @@ repository = "https://github.com/jeremyletang/rust-sfml"
 license = "zlib-acknowledgement"
 keywords = ["sfml", "multimedia", "game"]
 readme = "README.md"
-edition = "2021"
-rust-version = "1.82"
+edition = "2024"
+rust-version = "1.85"
 # We have to exclude a few things, otherwise, the package would be too big for crates.io
 exclude = [
     "SFML/doc",

README.md

@@ -30,7 +30,7 @@ Platform support
 Prerequisites
 =============
 
-- Rust 1.82 or later
+- Rust 1.85 or later
 - [CMake](https://cmake.org/), and a C++ toolchain for building SFML
 - 🐧 On Linux, you need the following dependencies installed:
    - Window module: `libGL libX11 libXcursor libXrandr`

examples/borrowed-resources.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
         CircleShape, Color, ConvexShape, Font, RenderTarget, RenderWindow, Shape, Sprite, Text,
         Texture, Transformable,
     },
     window::{Event, Key, Style},
-    SfResult,
 };
 
 include!("../example_common.rs");

examples/clock.rs

@@ -2,8 +2,8 @@
 
 use {
     sfml::{
-        system::{Clock, Time},
         SfError,
+        system::{Clock, Time},
     },
     std::io::Write,
 };

examples/cursor.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
         Color, Font, Rect, RectangleShape, RenderTarget, RenderWindow, Shape, Text, Transformable,
     },
     system::Vector2,
-    window::{mouse, ContextSettings, Cursor, CursorType, Event, Style},
-    SfResult,
+    window::{ContextSettings, Cursor, CursorType, Event, Style, mouse},
 };
 
 include!("../example_common.rs");

examples/custom-drawable.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
         CircleShape, Color, Drawable, RectangleShape, RenderStates, RenderTarget, RenderWindow,
         Shape, Transformable,
     },
     window::{Event, Key, Style},
-    SfResult,
 };
 
 /// Our custom drawable type. It looks like a bullet.

examples/custom-shape.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
         Color, CustomShape, CustomShapePoints, RenderTarget, RenderWindow, Shape, Transformable,
     },
     system::{Clock, Vector2f},
     window::{Event, Key, Style},
-    SfResult,
 };
 
 #[derive(Clone, Copy)]

examples/custom-sound-recorder.rs

@@ -1,6 +1,6 @@
 use {
     sfml::{
-        audio::{capture, Sound, SoundBuffer, SoundRecorder, SoundRecorderDriver},
+        audio::{Sound, SoundBuffer, SoundRecorder, SoundRecorderDriver, capture},
         graphics::{Color, Font, RectangleShape, RenderTarget, RenderWindow, Text, Transformable},
         window::{Event, Key, Style},
     },

examples/mouse.rs

@@ -1,4 +1,4 @@
-use sfml::{graphics::*, system::*, window::*, SfResult};
+use sfml::{SfResult, graphics::*, system::*, window::*};
 
 include!("../example_common.rs");
 

examples/music-stream.rs

@@ -1,7 +1,7 @@
 use {
     sfml::{
         audio::{Music, SoundStatus},
-        system::{sleep, InputStream, Time},
+        system::{InputStream, Time, sleep},
     },
     std::{error::Error, fs::File, io::Write},
 };

examples/opengl-context.rs

@@ -1,4 +1,4 @@
-use sfml::{window::Context, SfResult};
+use sfml::{SfResult, window::Context};
 
 fn main() -> SfResult<()> {
     // We have no active context, so this should be null

examples/opengl.rs

@@ -1,12 +1,12 @@
 use {
     glu_sys as gl,
     sfml::{
+        SfResult,
         graphics::{
             Color, Font, IntRect, RenderTarget, RenderWindow, Sprite, Text, Texture, Transformable,
         },
         system::Clock,
         window::{ContextSettings, Event, Key, Style},
-        SfResult,
     },
     std::{ffi::c_void, mem::size_of},
 };

examples/pong.rs

@@ -1,14 +1,14 @@
 use {
-    rand::{rngs::SmallRng, Rng as _, SeedableRng},
+    rand::{Rng as _, SeedableRng, rngs::SmallRng},
     sfml::{
+        SfResult,
         audio::{Sound, SoundBuffer, SoundSource},
         graphics::{
             CircleShape, Color, Font, RectangleShape, RenderTarget, RenderWindow, Shape, Text,
             Transformable,
         },
         system::{Clock, Time, Vector2f},
         window::{ContextSettings, Event, Key, Scancode, Style},
-        SfResult,
     },
     std::{env, f32::consts::PI},
 };

examples/positional-audio.rs

@@ -1,6 +1,6 @@
 use {
     sfml::{
-        audio::{listener, Music, SoundSource},
+        audio::{Music, SoundSource, listener},
         graphics::{
             CircleShape, Color, FloatRect, Font, RectangleShape, RenderStates, RenderTarget,
             RenderWindow, Shape, Text, Transformable,

examples/rc-resources.rs

@@ -1,11 +1,11 @@
 use sfml::{
+    SfResult,
     graphics::{
         Color, RcFont, RcSprite, RcText, RcTexture, RectangleShape, RenderTarget, RenderWindow,
         Shape, Sprite, Texture, Transformable,
     },
     system::Vector2f,
-    window::{clipboard, Event, Key, Style},
-    SfResult,
+    window::{Event, Key, Style, clipboard},
 };
 
 include!("../example_common.rs");

examples/resource-holder.rs

@@ -2,11 +2,11 @@
 
 use {
     sfml::{
+        SfResult,
         audio::{Sound, SoundBuffer},
         cpp::FBox,
         graphics::{Color, RenderTarget, RenderWindow, Sprite, Texture},
         window::{Event, Key, Style},
-        SfResult,
     },
     std::{collections::HashMap, hash::Hash},
 };

examples/shader.rs

@@ -1,6 +1,7 @@
 use {
-    rand::{rngs::SmallRng, Rng as _, SeedableRng},
+    rand::{Rng as _, SeedableRng, rngs::SmallRng},
     sfml::{
+        SfError, SfResult,
         cpp::FBox,
         graphics::{
             Color, Drawable, Font, IntRect, PrimitiveType, RenderStates, RenderTarget,
@@ -9,7 +10,6 @@ use {
         },
         system::{Clock, Vector2f},
         window::{Event, Key, Style},
-        SfError, SfResult,
     },
 };
 

examples/sound-capture.rs

@@ -1,7 +1,7 @@
 use {
     sfml::{
-        audio::{capture, Sound, SoundBufferRecorder, SoundStatus},
-        system::{sleep, Time},
+        audio::{Sound, SoundBufferRecorder, SoundStatus, capture},
+        system::{Time, sleep},
     },
     std::{
         error::Error,

examples/sound.rs

@@ -1,8 +1,8 @@
 use {
     sfml::{
-        audio::{Music, Sound, SoundBuffer, SoundStatus},
-        system::{sleep, Time},
         SfResult,
+        audio::{Music, Sound, SoundBuffer, SoundStatus},
+        system::{Time, sleep},
     },
     std::io::Write,
 };

examples/spritemark.rs

@@ -3,15 +3,15 @@
 //! It uses an array of primitives to achieve a speed faster than using `sf::Sprite`.
 
 use {
-    rand::{rngs::SmallRng, Rng as _, SeedableRng},
+    rand::{Rng as _, SeedableRng, rngs::SmallRng},
     sfml::{
+        SfResult,
         graphics::{
             Color, Font, PrimitiveType, Rect, RenderStates, RenderTarget, RenderWindow, Text,
             Texture, Transform, Vertex, View,
         },
         system::{Clock, Vector2, Vector2f, Vector2i},
-        window::{mouse::Button, ContextSettings, Event, Key, Style, VideoMode},
-        SfResult,
+        window::{ContextSettings, Event, Key, Style, VideoMode, mouse::Button},
     },
 };
 

examples/unicode-text-entry.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
         Color, Font, RectangleShape, RenderTarget, RenderWindow, Shape, Text, TextStyle,
         Transformable,
     },
-    window::{clipboard, Event, Key, Style},
-    SfResult,
+    window::{Event, Key, Style, clipboard},
 };
 
 include!("../example_common.rs");
@@ -105,16 +105,22 @@ fn main() -> SfResult<()> {
             let fc = text.fill_color();
             let oc = text.outline_color();
             format!(
-            "fill: {:02x}{:02x}{:02x}{:02x} outline: {:02x}{:02x}{:02x}{:02x} outline thickness: {}\n\
+                "fill: {:02x}{:02x}{:02x}{:02x} outline: {:02x}{:02x}{:02x}{:02x} outline thickness: {}\n\
             style: {:?} (F1-F4) cursor: {} (F5)\n\
             font family: {}",
-            fc.r, fc.g, fc.b, fc.a,
-            oc.r, oc.g, oc.b, oc.a,
-            text.outline_thickness(),
-            text.style(),
-            show_cursor,
-            font.info().family
-        )
+                fc.r,
+                fc.g,
+                fc.b,
+                fc.a,
+                oc.r,
+                oc.g,
+                oc.b,
+                oc.a,
+                text.outline_thickness(),
+                text.style(),
+                show_cursor,
+                font.info().family
+            )
         };
         status_text.set_string(&status_string);
 

examples/vertex-arrays.rs

@@ -1,10 +1,10 @@
 use sfml::{
+    SfResult,
     graphics::{
-        vertex_array_bounds, Color, PrimitiveType, RectangleShape, RenderStates, RenderTarget,
-        RenderWindow, Shape, Vertex,
+        Color, PrimitiveType, RectangleShape, RenderStates, RenderTarget, RenderWindow, Shape,
+        Vertex, vertex_array_bounds,
     },
     window::{Event, Style},
-    SfResult,
 };
 
 fn main() -> SfResult<()> {

examples/vertex-buffers.rs

@@ -1,9 +1,9 @@
 use sfml::{
+    SfResult,
     graphics::{
         Color, PrimitiveType, RenderTarget, RenderWindow, Vertex, VertexBuffer, VertexBufferUsage,
     },
-    window::{mouse::Button, Event, Style},
-    SfResult,
+    window::{Event, Style, mouse::Button},
 };
 
 fn main() -> SfResult<()> {

examples/window-test.rs

@@ -1,7 +1,7 @@
 use sfml::{
+    SfResult,
     graphics::{Color, Font, RenderTarget, RenderWindow, Text, Transformable},
     window::{ContextSettings, Event, Key, Style, VideoMode},
-    SfResult,
 };
 
 struct WindowConfig {

src/audio/capture.rs

@@ -1,10 +1,10 @@
 use {
     crate::{
+        IntoSfResult, SfResult,
         audio::SoundBuffer,
         cpp::{CppString, CppVector, FBox},
         ffi::audio as ffi,
         system::Time,
-        IntoSfResult, SfResult,
     },
     std::{ffi::CString, os::raw::c_void, ptr::NonNull},
 };

src/audio/music.rs

@@ -1,9 +1,9 @@
 use {
     crate::{
+        IntoSfResult, SfResult,
         audio::{SoundSource, SoundStatus, TimeSpan},
         ffi::{self},
         system::{InputStream, Time, Vector3f},
-        IntoSfResult, SfResult,
     },
     std::{
         ffi::CString,

src/audio/sound_buffer.rs

@@ -1,9 +1,9 @@
 use {
     crate::{
+        IntoSfResult, SfResult,
         cpp::FBox,
         ffi::{self},
         system::{InputStream, Time},
-        IntoSfResult, SfResult,
     },
     std::{
         ffi::CString,

src/ffi/graphics.rs

@@ -2,7 +2,7 @@ pub use crate::ffi::*;
 use {
     super::system::sfInputStreamHelper,
     crate::{
-        ffi::window::{sfContextSettings, sfCursor, sfWindow, sfWindowHandle, Event as sfEvent},
+        ffi::window::{Event as sfEvent, sfContextSettings, sfCursor, sfWindow, sfWindowHandle},
         graphics::{Color, Rect, RenderStates as sfRenderStates, Transform as sfTransform},
         window::VideoMode as sfVideoMode,
     },

src/ffi/window.rs

@@ -1,7 +1,7 @@
 pub use crate::ffi::*;
 use crate::{
     system::SfString as sfString,
-    window::{joystick::Identification as sfJoystickIdentification, VideoMode as sfVideoMode},
+    window::{VideoMode as sfVideoMode, joystick::Identification as sfJoystickIdentification},
 };
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};