Update pixels

forge_core/Cargo.toml

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

novaforth/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "novaforth"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [build-dependencies]
 vasm_core = { path = "../vasm_core" }

vasm/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "vasm"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 vasm_core = { path = "../vasm_core" }
-clap = { version = "3.1.18", features = ["derive"] }
+clap = { version = "4.6.6", features = ["derive"] }
 regex = "1.7.0"
 serde_json = "1.0.91"

vasm/src/main.rs

@@ -7,18 +7,18 @@ use serde_json::json;
 
 /// Vulcan Assembler
 #[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
+#[command(author, version, about, long_about = None)]
 struct Args {
     /// File to output to
-    #[clap(short, long)]
+    #[arg(short, long)]
     output: Option<String>,
 
     /// Whether to generate a JSON file containing the symbol table
-    #[clap(short, long)]
+    #[arg(short, long)]
     symbols: bool,
 
     /// Input file
-    #[clap()]
+    #[arg()]
     file: String,
 }
 

vasm_core/Cargo.toml

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

vcore/Cargo.toml

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

vcore/src/memory.rs

@@ -14,7 +14,7 @@ impl<R: Rng> From<R> for Memory {
     fn from(mut rng: R) -> Self {
         let mut mem = Memory::default();
         for i in 0..(MEM_SIZE - 1) {
-            mem.0[i as usize] = rng.gen()
+            mem.0[i as usize] = rng.r#gen()
         }
         mem
     }

vemu/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "vemu"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -11,4 +11,4 @@ vgfx = { path = "../vgfx" }
 vasm_core = { path = "../vasm_core" }
 rand = "0.8.0"
 winit = "0.30.12"
-pixels = "0.15.0"
+pixels = "0.17.2"

vgfx/Cargo.toml

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

vlua/Cargo.toml

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

vtest/Cargo.toml

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

vweb/Cargo.toml

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