Bump edition to 2024

The `_sys` crates edition was not bumped along the way due to heavy use
of generators, which are still not updated to 2024 thus breaking build
due to `unsafe` being required for `extern` now.

Author: madsmtm

.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust_version: [1.71.0, stable, nightly]
+        rust_version: [1.85.0, stable, nightly]
         platform:
           - { target: x86_64-pc-windows-msvc,   os: windows-latest,  }
           - { target: i686-pc-windows-msvc,     os: windows-latest,  }
@@ -59,10 +59,10 @@ jobs:
           - { target: x86_64-apple-darwin,      os: macos-latest,    }
         exclude:
           # Android is tested on stable-3
-          - rust_version: '1.71.0'
+          - rust_version: '1.85.0'
             platform: { target: aarch64-linux-android,    os: ubuntu-latest, cmd: 'apk --'   }
         include:
-          - rust_version: '1.71.0'
+          - rust_version: '1.85.0'
             platform: { target: aarch64-linux-android,    os: ubuntu-latest, cmd: 'apk --'   }
 
 
@@ -110,5 +110,5 @@ jobs:
 
     - name: Lint with clippy
       shell: bash
-      if: (matrix.rust_version == '1.71.0') && !contains(matrix.platform.options, '--no-default-features')
+      if: (matrix.rust_version == '1.85.0') && !contains(matrix.platform.options, '--no-default-features')
       run: cargo clippy --workspace --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 
 - **Breaking:** Added `make_current_surfaceless(self)` for `{Possibly,Not}CurrentGlContext`.
+- Updated `objc2` frameworks dependency to `v0.3.2`.
+- Use `objc2-open-gl` instead of `cgl` dependency.
+- Bump MSRV from `1.71` to `1.85`.
 
 # Version 0.32.3
 

Cargo.toml

@@ -12,4 +12,5 @@ members = [
 
 [workspace.package]
 # MSRV. Also update in ci.yml
-rust-version = "1.71.0"
+rust-version = "1.85.0"
+edition = "2024"

glutin-winit/Cargo.toml

@@ -7,8 +7,8 @@ keywords = ["windowing", "opengl", "winit"]
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/rust-windowing/glutin"
-edition = "2021"
 rust-version.workspace = true
+edition.workspace = true
 
 [features]
 default = ["egl", "glx", "x11", "wayland", "wgl"]

glutin-winit/src/lib.rs

@@ -29,10 +29,10 @@ use raw_window_handle::RawWindowHandle;
 use winit::error::OsError;
 use winit::window::{Window, WindowAttributes};
 
-#[cfg(glx_backend)]
-use winit::platform::x11::register_xlib_error_hook;
 #[cfg(x11_platform)]
 use winit::platform::x11::WindowAttributesExtX11;
+#[cfg(glx_backend)]
+use winit::platform::x11::register_xlib_error_hook;
 
 #[cfg(all(not(egl_backend), not(glx_backend), not(wgl_backend), not(cgl_backend)))]
 compile_error!("Please select at least one api backend");

glutin/Cargo.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 repository = "https://github.com/rust-windowing/glutin"
 documentation = "https://docs.rs/glutin"
 rust-version.workspace = true
-edition = "2021"
+edition.workspace = true
 
 [features]
 default = ["egl", "glx", "x11", "wayland", "wgl"]
@@ -54,33 +54,37 @@ wayland-sys = { version = "0.31.1", default-features = false, features = [
 x11-dl = { version = "2.20.0", optional = true }
 
 [target.'cfg(any(target_os = "macos"))'.dependencies]
-cgl = "0.3.2"
 dispatch2 = { version = "0.3.0", default-features = false, features = [
     "std",
     "objc2",
 ] }
 objc2 = "0.6.1"
-objc2-core-foundation = { version = "0.3.1", default-features = false, features = [
+objc2-core-foundation = { version = "0.3.2", default-features = false, features = [
     "std",
     "CFBase",
     "CFString",
     "CFBundle",
 ] }
-objc2-foundation = { version = "0.3.1", default-features = false, features = [
+objc2-foundation = { version = "0.3.2", default-features = false, features = [
     "std",
     "NSArray",
     "NSThread",
 ] }
-objc2-app-kit = { version = "0.3.1", default-features = false, features = [
+objc2-app-kit = { version = "0.3.2", default-features = false, features = [
     "std",
     "objc2-core-foundation",
+    "objc2-open-gl",
     "NSApplication",
     "NSResponder",
     "NSView",
     "NSWindow",
     "NSOpenGL",
     "NSOpenGLView",
 ] }
+objc2-open-gl = { version = "0.3.2", default-features = false, features = [
+    "std",
+    "CGLTypes",
+] }
 
 [build-dependencies]
 cfg_aliases = "0.2.1"

glutin/src/api/cgl/appkit.rs

@@ -1,17 +1,19 @@
 //! Everything related to `NSOpenGLPixelFormat`.
 
+use std::ptr::NonNull;
 use std::sync::Arc;
 use std::{fmt, iter};
 
+use objc2::AllocAnyThread;
 use objc2::rc::Retained;
 #[allow(deprecated)]
 use objc2_app_kit::{
     NSOpenGLPFAAccelerated, NSOpenGLPFAAllowOfflineRenderers, NSOpenGLPFAAlphaSize,
     NSOpenGLPFAColorFloat, NSOpenGLPFAColorSize, NSOpenGLPFADepthSize, NSOpenGLPFADoubleBuffer,
     NSOpenGLPFAMinimumPolicy, NSOpenGLPFAMultisample, NSOpenGLPFAOpenGLProfile,
     NSOpenGLPFASampleBuffers, NSOpenGLPFASamples, NSOpenGLPFAStencilSize, NSOpenGLPFAStereo,
-    NSOpenGLPFATripleBuffer, NSOpenGLPixelFormatAttribute, NSOpenGLProfileVersion3_2Core,
-    NSOpenGLProfileVersion4_1Core, NSOpenGLProfileVersionLegacy,
+    NSOpenGLPFATripleBuffer, NSOpenGLPixelFormat, NSOpenGLPixelFormatAttribute,
+    NSOpenGLProfileVersion3_2Core, NSOpenGLProfileVersion4_1Core, NSOpenGLProfileVersionLegacy,
 };
 
 use crate::config::{
@@ -21,7 +23,6 @@ use crate::display::GetGlDisplay;
 use crate::error::{ErrorKind, Result};
 use crate::private::Sealed;
 
-use super::appkit::NSOpenGLPixelFormat;
 use super::display::Display;
 
 impl Display {
@@ -47,9 +48,10 @@ impl Display {
                 attrs.push((r_size + g_size + b_size + template.alpha_size) as u32);
             },
             _ => {
-                return Err(
-                    ErrorKind::NotSupported("luminance buffers are not supported with CGL").into()
+                return Err(ErrorKind::NotSupported(
+                    "luminance buffers are not supported with CGL",
                 )
+                .into());
             },
         }
 
@@ -113,7 +115,12 @@ impl Display {
         .find_map(|profile| {
             attrs[profile_attr_pos] = profile;
             // initWithAttributes returns None if the attributes were invalid
-            unsafe { NSOpenGLPixelFormat::newWithAttributes(&attrs) }
+            unsafe {
+                NSOpenGLPixelFormat::initWithAttributes(
+                    <NSOpenGLPixelFormat as AllocAnyThread>::alloc(),
+                    NonNull::new(attrs.as_ptr().cast_mut()).unwrap(),
+                )
+            }
         })
         .ok_or(ErrorKind::BadConfig)?;
 
@@ -135,11 +142,13 @@ pub struct Config {
 }
 
 impl Config {
+    #[allow(deprecated)]
     fn raw_attribute(&self, attrib: NSOpenGLPixelFormatAttribute) -> i32 {
         unsafe {
             let mut value = 0;
             self.inner.raw.getValues_forAttribute_forVirtualScreen(
-                &mut value, attrib,
+                NonNull::from(&mut value),
+                attrib,
                 // They do differ per monitor and require context. Which is kind of insane, but
                 // whatever. Zero is a primary monitor.
                 0,
@@ -228,9 +237,13 @@ impl Sealed for Config {}
 pub(crate) struct ConfigInner {
     display: Display,
     pub(crate) transparency: bool,
+    #[allow(deprecated)]
     pub(crate) raw: Retained<NSOpenGLPixelFormat>,
 }
 
+unsafe impl Send for ConfigInner {}
+unsafe impl Sync for ConfigInner {}
+
 impl PartialEq for ConfigInner {
     fn eq(&self, other: &Self) -> bool {
         self.raw == other.raw