Merge pull request #74 from rust3ds/version-bump

Edition, dependency and CI update (with fmt)

Author: Meziu

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         toolchain:
           # Run against a "known good" nightly. Rustc version is 1 day behind the toolchain date
-          - nightly-2024-02-18
+          - nightly-2025-07-25
           # Check for breakage on latest nightly
           - nightly
 
@@ -50,7 +50,7 @@ jobs:
       fail-fast: false
       matrix:
         toolchain:
-          - nightly-2024-02-18
+          - nightly-2025-07-25
           - nightly
     continue-on-error: ${{ matrix.toolchain == 'nightly' }}
     runs-on: ubuntu-latest
@@ -80,7 +80,7 @@ jobs:
           args: --doc --package citro3d
 
       - name: Upload citra logs and capture videos
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success() || failure() # always run unless the workflow was cancelled
         with:
           name: citra-logs-${{ matrix.toolchain }}

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: rust3ds/test-runner/setup@v1
         with:
-          toolchain: nightly-2024-02-18
+          toolchain: nightly-2025-07-25
 
       - name: Build workspace docs
         run: cargo 3ds --verbose doc --verbose --no-deps --workspace
@@ -43,7 +43,7 @@ jobs:
         run: cp -R ./target/armv6k-nintendo-3ds/doc ./_site/crates
 
       - name: Upload docs
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
 
   deploy:
     runs-on: ubuntu-latest
@@ -60,5 +60,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
-
+        uses: actions/deploy-pages@v4

citro3d-macros/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "citro3d-macros"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["Rust3DS Org"]
 license = "MIT OR Apache-2.0"
 
 [lib]
 proc-macro = true
 
 [dependencies]
-litrs = { version = "0.4.0", default-features = false }
-quote = "1.0.32"
+litrs = { version = "0.5.1", default-features = false }
+quote = "1.0.40"

citro3d-macros/src/lib.rs

@@ -79,7 +79,10 @@ fn include_shader_impl(input: TokenStream) -> Result<TokenStream, Box<dyn Error>
     let cwd = env::current_dir()
         .map_err(|err| format!("unable to determine current directory: {err}"))?;
 
-    let invoking_source_file = shader_source_filename.span().source_file().path();
+    let invoking_source_file = shader_source_filename
+        .span()
+        .local_file()
+        .expect("source file not found");
     let Some(invoking_source_dir) = invoking_source_file.parent() else {
         return Ok(quote! {
             compile_error!(

citro3d-sys/Cargo.toml

@@ -2,17 +2,17 @@
 name = "citro3d-sys"
 version = "0.1.0"
 authors = ["Rust3DS Org", "panicbit <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license = "Zlib"
 links = "citro3d"
 
 [dependencies]
-libc = "0.2.116"
+libc = "0.2.175"
 ctru-sys = { git = "https://github.com/rust3ds/ctru-rs.git" }
 
 [build-dependencies]
-bindgen = { version = "0.68.1", features = ["experimental"] }
-cc = "1.0.83"
+bindgen = { version = "0.72", features = ["experimental"] }
+cc = "1.0"
 doxygen-rs = "0.4.2"
 
 [dev-dependencies]

citro3d-sys/build.rs

@@ -58,7 +58,7 @@ fn main() {
         .header(three_ds_h.to_str().unwrap())
         .header(citro3d_h.to_str().unwrap())
         .header(tex3ds_h.to_str().unwrap())
-        .rust_target(RustTarget::Nightly)
+        .rust_target(RustTarget::nightly())
         .use_core()
         .trust_clang_mangling(false)
         .layout_tests(false)

citro3d/Cargo.toml

@@ -3,19 +3,19 @@ name = "citro3d"
 authors = ["Rust3DS Org"]
 license = "MIT OR Apache-2.0"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-glam = { version = "0.24.2", optional = true }
+glam = { version = "0.30.5", optional = true }
 approx = { version = "0.5.1", optional = true }
-bitflags = "1.3.2"
-bytemuck = { version = "1.10.0", features = ["extern_crate_std"] }
+bitflags = "2.9.1"
+bytemuck = { version = "1.23.2", features = ["extern_crate_std"] }
 citro3d-macros = { version = "0.1.0", path = "../citro3d-macros" }
 citro3d-sys = { git = "https://github.com/rust3ds/citro3d-rs.git" }
 ctru-rs = { git = "https://github.com/rust3ds/ctru-rs.git" }
 ctru-sys = { git = "https://github.com/rust3ds/ctru-rs.git" }
-document-features = "0.2.7"
-libc = "0.2.125"
+document-features = "0.2.11"
+libc = "0.2.175"
 
 [features]
 default = ["glam"]

citro3d/src/render.rs

@@ -5,7 +5,7 @@ use std::cell::RefMut;
 use std::rc::Rc;
 
 use citro3d_sys::{
-    C3D_RenderTarget, C3D_RenderTargetCreate, C3D_RenderTargetDelete, C3D_DEPTHTYPE,
+    C3D_DEPTHTYPE, C3D_RenderTarget, C3D_RenderTargetCreate, C3D_RenderTargetDelete,
 };
 use ctru::services::gfx::Screen;
 use ctru::services::gspgpu::FramebufferFormat;

citro3d/src/shader.rs

@@ -175,7 +175,7 @@ impl Library {
 
     /// Get the [`Entrypoint`] at the given index, if present.
     #[must_use]
-    pub fn get(&self, index: usize) -> Option<Entrypoint> {
+    pub fn get(&self, index: usize) -> Option<Entrypoint<'_>> {
         if index < self.len() {
             Some(Entrypoint {
                 ptr: unsafe { (*self.0).DVLE.add(index) },

citro3d/src/uniform.rs

@@ -4,7 +4,7 @@
 use std::ops::Range;
 
 use crate::math::{FVec4, IVec, Matrix4};
-use crate::{shader, Instance};
+use crate::{Instance, shader};
 
 /// The index of a uniform within a [`shader::Program`].
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -82,7 +82,13 @@ impl Uniform {
             index,
             self.index_range(),
         );
-        assert!(self.index_range().end.0 as usize >= self.len() + index.0 as usize, "tried to bind a uniform that would overflow the uniform buffer. index was {:?}, size was {} max is {:?}", index, self.len(), self.index_range().end);
+        assert!(
+            self.index_range().end.0 as usize >= self.len() + index.0 as usize,
+            "tried to bind a uniform that would overflow the uniform buffer. index was {:?}, size was {} max is {:?}",
+            index,
+            self.len(),
+            self.index_range().end
+        );
         let set_fvs = |fs: &[FVec4]| {
             for (off, f) in fs.iter().enumerate() {
                 unsafe {