From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 5 Jul 2025 19:31:08 +0000 (-0700)
Subject: update to 2024 edition
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc6bc6320a88f8ea7c7cafa4fb35f48bd480b737;p=pspp

update to 2024 edition
---

diff --git a/rust/pspp/Cargo.toml b/rust/pspp/Cargo.toml
index 731595c284..f0a454af7d 100644
--- a/rust/pspp/Cargo.toml
+++ b/rust/pspp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pspp"
 version = "1.0.0"
-edition = "2021"
+edition = "2024"
 authors = [ "Ben Pfaff", "John Darrington" ]
 
 [dependencies]
diff --git a/rust/pspp/src/locale_charset.rs b/rust/pspp/src/locale_charset.rs
index f3ab0c1841..26856ef803 100644
--- a/rust/pspp/src/locale_charset.rs
+++ b/rust/pspp/src/locale_charset.rs
@@ -231,7 +231,7 @@ mod inner {
         if s.is_null() {
             None
         } else {
-            Some(CStr::from_ptr(s).to_string_lossy().into())
+            Some(unsafe { CStr::from_ptr(s).to_string_lossy().into() })
         }
     }