Update toolchain

Author: hasali19

Cargo.toml

@@ -4,7 +4,7 @@ members = ["jdk-tools"]
 [package]
 name = "rusty-java"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-07-25"
+channel = "nightly-2025-12-12"
 components = ["rustfmt", "clippy"]

src/call_frame.rs

@@ -4,12 +4,12 @@ use std::mem;
 use std::ptr::NonNull;
 use std::time::SystemTime;
 
-use color_eyre::eyre::{self, bail, eyre, ContextCompat};
+use color_eyre::eyre::{self, ContextCompat, bail, eyre};
 use strum::EnumTryAs;
 
 use crate::class::{Class, Method};
-use crate::class_file::constant_pool::{self, ConstantInfo};
 use crate::class_file::MethodAccessFlags;
+use crate::class_file::constant_pool::{self, ConstantInfo};
 use crate::descriptor::{BaseType, FieldType};
 use crate::instructions::{
     ArrayLoadStoreType, ArrayType, Condition, Instruction, InvokeKind, LoadStoreType, NumberType,
@@ -79,23 +79,26 @@ impl RefTypeHeader {
         Ok(unsafe { std::slice::from_raw_parts_mut(data_ptr, length) })
     }
 
-    unsafe fn object_data<'a>(&mut self) -> eyre::Result<&'a mut [JvmValue]> {
-        let target_class = match self {
-            Self::Object(object) => object.class,
-            Self::Array(_) => bail!("expected an object"),
-        };
+    unsafe fn object_data<'a>(&mut self) -> eyre::Result<&'a mut [JvmValue<'_>]> {
+        unsafe {
+            let target_class = match self {
+                Self::Object(object) => object.class,
+                Self::Array(_) => bail!("expected an object"),
+            };
 
-        let fields_layout = Layout::array::<JvmValue>((*target_class.as_ptr()).fields().len())?;
-        let (object_layout, _) = Layout::new::<RefTypeHeader>().extend(fields_layout)?;
+            let fields_layout = Layout::array::<JvmValue>((*target_class.as_ptr()).fields().len())?;
+            let (object_layout, _) = Layout::new::<RefTypeHeader>().extend(fields_layout)?;
 
-        let offset = object_layout.size() - fields_layout.size();
+            let offset = object_layout.size() - fields_layout.size();
 
-        let header_ptr = self as *mut RefTypeHeader;
-        let data_ptr = (header_ptr as usize + offset) as *mut JvmValue;
+            let header_ptr = self as *mut RefTypeHeader;
+            let data_ptr = (header_ptr as usize + offset) as *mut JvmValue;
 
-        Ok(unsafe {
-            std::slice::from_raw_parts_mut(data_ptr, (*target_class.as_ptr()).fields().len())
-        })
+            Ok(std::slice::from_raw_parts_mut(
+                data_ptr,
+                (*target_class.as_ptr()).fields().len(),
+            ))
+        }
     }
 }
 
@@ -162,7 +165,7 @@ impl<'a, 'b> CallFrame<'a, 'b> {
                         ReturnType::Int => {
                             return Ok(Some(
                                 self.operand_stack.pop().wrap_err("missing return value")?,
-                            ))
+                            ));
                         }
                         ReturnType::Long => todo!(),
                         ReturnType::Float => todo!(),

src/class.rs

@@ -4,17 +4,17 @@ use std::io::{self, Cursor};
 use std::num::NonZeroU8;
 
 use bumpalo::collections::Vec;
-use bumpalo::{vec, Bump};
+use bumpalo::{Bump, vec};
 use byteorder::{BigEndian, ReadBytesExt};
-use color_eyre::eyre::{self, bail, eyre, Context, ContextCompat};
+use color_eyre::eyre::{self, Context, ContextCompat, bail, eyre};
 use hashbrown::HashMap;
 
 use crate::call_frame::JvmValue;
 use crate::class_file::constant_pool::ConstantPool;
 use crate::class_file::{ClassFile, FieldAccessFlags, MethodAccessFlags};
 use crate::descriptor::{
-    parse_field_descriptor, parse_method_descriptor, BaseType, FieldDescriptor, FieldType,
-    MethodDescriptor,
+    BaseType, FieldDescriptor, FieldType, MethodDescriptor, parse_field_descriptor,
+    parse_method_descriptor,
 };
 use crate::instructions::{
     ArrayLoadStoreType, ArrayType, Condition, EqCondition, Instruction, IntegerType, InvokeKind,
@@ -217,7 +217,7 @@ impl<'a> Class<'a> {
         self.methods.get(&MethodId { name, descriptor })
     }
 
-    pub fn constant_pool(&self) -> &'a ConstantPool {
+    pub fn constant_pool(&self) -> &'a ConstantPool<'_> {
         &self.class_file.constant_pool
     }
 

src/class_file.rs

@@ -27,7 +27,7 @@ pub mod constant_pool {
     pub struct ConstantPool<'a>(pub(crate) bumpalo::collections::Vec<'a, ConstantInfo<'a>>);
 
     impl<'a> ConstantPool<'a> {
-        pub fn get(&self, index: u16) -> Option<&ConstantInfo> {
+        pub fn get(&self, index: u16) -> Option<&ConstantInfo<'_>> {
             self.0.get(index.checked_sub(1)? as usize)
         }
     }

src/descriptor.rs

@@ -33,7 +33,7 @@ pub struct MethodDescriptor<'a> {
     pub return_type: Option<FieldType<'a>>,
 }
 
-pub fn parse_method_descriptor(descriptor: &str) -> eyre::Result<MethodDescriptor> {
+pub fn parse_method_descriptor(descriptor: &str) -> eyre::Result<MethodDescriptor<'_>> {
     let (params, return_type) = (parse_params_types, parse_return_type)
         .parse(descriptor)
         .map_err(|e| eyre!("{e}"))?;
@@ -44,7 +44,7 @@ pub fn parse_method_descriptor(descriptor: &str) -> eyre::Result<MethodDescripto
     })
 }
 
-pub fn parse_field_descriptor(descriptor: &str) -> eyre::Result<FieldDescriptor> {
+pub fn parse_field_descriptor(descriptor: &str) -> eyre::Result<FieldDescriptor<'_>> {
     let field_type = parse_field_type
         .parse(descriptor)
         .map_err(|e| eyre!("{e}"))?;

src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(cursor_remaining, let_chains, macro_metavar_expr)]
+#![feature(macro_metavar_expr)]
 
 pub mod call_frame;
 pub mod class;

src/reader.rs

@@ -1,9 +1,9 @@
 use std::io;
 
 use bumpalo::collections::{CollectIn, String, Vec};
-use bumpalo::{vec, Bump};
+use bumpalo::{Bump, vec};
 use byteorder::{BigEndian, ReadBytesExt};
-use color_eyre::eyre::{self, bail, eyre, Context};
+use color_eyre::eyre::{self, Context, bail, eyre};
 
 use crate::class_file::constant_pool::{self, ConstantInfo, ConstantPool};
 use crate::class_file::{

src/vm.rs

@@ -6,7 +6,7 @@ use std::path::Path;
 use std::time::SystemTime;
 
 use bumpalo::Bump;
-use color_eyre::eyre::{self, eyre, Context};
+use color_eyre::eyre::{self, Context, eyre};
 
 use crate::call_frame::CallFrame;
 use crate::class::{Class, Method};