From 04017f19060b4bce3692fae5d138378e4b1baf40 Mon Sep 17 00:00:00 2001
From: Samuel Riedel <sriedel@iis.ee.ethz.ch>
Date: Mon, 8 Jul 2024 17:46:16 +0200
Subject: [PATCH] Update Rust to 1.67 to keep up with "cc"'s requirements

---
 .github/workflows/ci.yml | 2 +-
 README.md                | 6 +++---
 rust-toolchain.toml      | 2 +-
 src/engine.rs            | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47b493c..c7502c7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         rust:
-        - 1.63.0   # minimum supported version
+        - 1.67.0   # minimum supported version
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/README.md b/README.md
index ab5f3a3..c14a0c9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Banshee is a binary-translation-based, instruction-accurate RISC-V simulator for
 
 ## Requirements
 
-Banshee currently requires Rust version 1.63.0 and LLVM 12.
+Banshee currently requires Rust version 1.67.0 and LLVM 12.
 
 To install Rust, visit [Rustup](https://rustup.rs/) and choose the correct version of Rust during the installation process.
 
@@ -16,10 +16,10 @@ If you already have Rust installed, get the specific version of the Rust with:
 
 ```bash
 # Install the correct Rust version
-rustup install 1.63.0
+rustup install 1.67.0
 
 # Change default toolchain version
-rustup default 1.63.0
+rustup default 1.67.0
 ```
 
 To get LLVM on Ubuntu, install the following packages:
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 07d72a9..05aea4e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.63.0"
+channel = "1.67.0"
 components = [ "rustfmt" ]
diff --git a/src/engine.rs b/src/engine.rs
index f32a539..b8dff5f 100644
--- a/src/engine.rs
+++ b/src/engine.rs
@@ -113,7 +113,7 @@ impl Engine {
                 );
 
                 // Parse the module.
-                let mut module = std::mem::MaybeUninit::uninit().assume_init();
+                let mut module = std::mem::MaybeUninit::zeroed().assume_init();
                 let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
                 if LLVMParseIRInContext(self.context, initial_buf, &mut module, &mut errmsg) != 0
                     || !errmsg.is_null()
@@ -171,7 +171,7 @@ impl Engine {
                 );
 
                 // Parse the module.
-                let mut runtime = std::mem::MaybeUninit::uninit().assume_init();
+                let mut runtime = std::mem::MaybeUninit::zeroed().assume_init();
                 let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
                 if LLVMParseIRInContext(self.context, runtime_buf, &mut runtime, &mut errmsg) != 0
                     || !errmsg.is_null()
@@ -337,7 +337,7 @@ impl Engine {
         debug!("Creating JIT compiler for translated code");
         let execs: Vec<_> = (0..self.num_clusters)
             .map(|i| {
-                let mut ee = std::mem::MaybeUninit::uninit().assume_init();
+                let mut ee = std::mem::MaybeUninit::zeroed().assume_init();
                 let mut errmsg = std::mem::MaybeUninit::zeroed().assume_init();
                 let optlevel = if self.opt_jit { 3 } else { 0 };
                 LLVMCreateJITCompilerForModule(&mut ee, self.modules[i], optlevel, &mut errmsg);