Merge pull request #192 from rust3ds/msrv-bumper

rust3ds · Aug 15, 2024 · 4a15ec9 · 4a15ec9
2 parents 7e0be08 + 98c46df
commit 4a15ec9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         toolchain:
           # Run against a "known good" nightly. Rustc version is 1 day behind the toolchain date
-          - nightly-2024-02-18
+          - nightly-2024-03-10
           # Check for breakage on latest nightly
           - nightly
 
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         toolchain:
-          - nightly-2024-02-18
+          - nightly-2024-03-10
           - nightly
     continue-on-error: ${{ matrix.toolchain == 'nightly' }}
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ Cargo.lock
 # IDE files
 .idea
 .vscode
+.zed
diff --git a/ctru-rs/Cargo.toml b/ctru-rs/Cargo.toml
@@ -10,7 +10,7 @@ categories = ["os", "api-bindings", "hardware-support"]
 exclude = ["examples"]
 license = "Zlib"
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.78"
 
 [lib]
 crate-type = ["rlib"]
@@ -19,13 +19,12 @@ name = "ctru"
 [dependencies]
 cfg-if = "1.0"
 ctru-sys = { path = "../ctru-sys", version = "0.5.0" }
-const-zero = "0.1.0"
 shim-3ds = { workspace = true }
 pthread-3ds = { workspace = true }
 libc = { workspace = true, default-features = true }
-bitflags = "2.3.3"
+bitflags = "2.6.0"
 macaddr = "1.0.1"
-widestring = "1.0.2"
+widestring = "1.1.0"
 
 [build-dependencies]
 toml = "0.5"

diff --git a/ctru-rs/examples/local-networking.rs b/ctru-rs/examples/local-networking.rs
@@ -60,8 +60,8 @@ fn main() -> Result<(), Error> {
 
     let mut mode = ConnectionType::Client;
 
-    let mut channel = 0;
-    let data_channel = 1;
+    let mut channel: u8;
+    let data_channel: u8 = 1;
 
     let mut prev_node_mask = 0;
 

diff --git a/ctru-rs/src/console.rs b/ctru-rs/src/console.rs
@@ -11,7 +11,7 @@ use ctru_sys::{consoleClear, consoleInit, consoleSelect, consoleSetWindow, Print
 
 use crate::services::gfx::{Flush, Screen, Swap};
 
-static mut EMPTY_CONSOLE: PrintConsole = unsafe { const_zero::const_zero!(PrintConsole) };
+static mut EMPTY_CONSOLE: PrintConsole = unsafe { std::mem::zeroed::<PrintConsole>() };
 
 /// Error enum for generic errors within [`Console`].
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]

diff --git a/ctru-rs/src/lib.rs b/ctru-rs/src/lib.rs
@@ -23,7 +23,6 @@
 #![feature(try_trait_v2)]
 #![feature(allocator_api)]
 #![feature(new_uninit)]
-#![feature(diagnostic_namespace)]
 #![test_runner(test_runner::run_gdb)] // TODO: does this make sense to have configurable?
 #![doc(
     html_favicon_url = "https://user-images.githubusercontent.com/11131775/225929072-2fa1741c-93ae-4b47-9bdf-af70f3d59910.png"

diff --git a/ctru-sys/build.rs b/ctru-sys/build.rs
@@ -239,7 +239,7 @@ fn get_libctru_version(pacman: &Path) -> Result<(String, String, String, String)
 
 fn parse_libctru_version(version: &str) -> Result<(String, String, String, String), String> {
     version
-        .split(|c| c == '.' || c == '-')
+        .split(['.', '-'])
         .map(String::from)
         .collect_tuple()
         .ok_or_else(|| format!("unexpected number of version segments: {version:?}"))

diff --git a/ctru-sys/src/lib.rs b/ctru-sys/src/lib.rs
@@ -3,6 +3,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(clippy::all)]
+#![allow(unexpected_cfgs)] // Read below why we necessate a check for rust_analyzer.
 #![deny(ambiguous_glob_reexports)]
 #![cfg_attr(test, feature(custom_test_frameworks))]
 #![cfg_attr(test, test_runner(test_runner::run_gdb))]