From b7509a2425e2b75be543dc77b2ca002397b13086 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Thu, 20 Feb 2025 18:20:55 +0100 Subject: [PATCH] use rust 2024 edition (#268) --- Cargo.toml | 4 ++-- src/device/rdram.rs | 2 +- src/savestates.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2de8fc47..97137183 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "gopher64" version = "1.0.8" -edition = "2021" -rust-version = "1.82" +edition = "2024" +rust-version = "1.85" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/device/rdram.rs b/src/device/rdram.rs index a8946bd3..71cf4965 100644 --- a/src/device/rdram.rs +++ b/src/device/rdram.rs @@ -1,6 +1,6 @@ use crate::device; use crate::ui; -use std::alloc::{alloc_zeroed, Layout}; +use std::alloc::{Layout, alloc_zeroed}; //const RDRAM_CONFIG_REG: u32 = 0; //const RDRAM_DEVICE_ID_REG: u32 = 1; diff --git a/src/savestates.rs b/src/savestates.rs index 3213f436..375325ef 100644 --- a/src/savestates.rs +++ b/src/savestates.rs @@ -191,8 +191,8 @@ where [device::cop0::reserved; N] } -pub fn default_memory_read( -) -> [fn(&mut device::Device, u64, device::memory::AccessSize) -> u32; 0x2000] { +pub fn default_memory_read() +-> [fn(&mut device::Device, u64, device::memory::AccessSize) -> u32; 0x2000] { [device::rdram::read_mem; 0x2000] }