From: Peter Mikkelsen <petermikkelsen10@gmail.com>
Date: Sun, 24 Aug 2025 12:17:41 +0000 (+0200)
Subject: Update src/read.rs
X-Git-Tag: v0.10.0~12^2~1
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=90e6e843128dfa1c1d3fa46e3229be39d4b88d7c;p=scryer-prolog.git

Update src/read.rs

Co-authored-by: Bennet Bleßmann <3877590+Skgland@users.noreply.github.com>
---

diff --git a/src/read.rs b/src/read.rs
index 636a6f49..586ab738 100644
--- a/src/read.rs
+++ b/src/read.rs
@@ -107,27 +107,25 @@ fn get_prompt() -> &'static str {
     }
 }
 
-static mut RAW_READ: bool = false;
+thread_local! {
+    static RAW_READ: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
+}
 
 pub struct RawReadGuard;
 
 impl RawReadGuard {
     pub fn new() -> RawReadGuard {
-        unsafe {
-            if RAW_READ {
-                panic!("Nested RawReadGuards");
-            }
-            RAW_READ = true;
+        if RAW_READ.get() {
+            panic!("Nested RawReadGuards");
         }
+        RAW_READ.set(true);
         RawReadGuard
     }
 }
 
 impl Drop for RawReadGuard {
     fn drop(&mut self) {
-        unsafe {
-            RAW_READ = false;
-        }
+        RAW_READ.set(false);
     }
 }
 
@@ -196,8 +194,7 @@ impl ReadlineStream {
 
     #[cfg(feature = "repl")]
     fn call_readline(&mut self) -> std::io::Result<usize> {
-        let raw = unsafe { RAW_READ };
-        let text = if raw {
+        let text = if RAW_READ.get() {
             let mut buffer = String::new();
             let stdin = std::io::stdin();
             match stdin.read_line(&mut buffer) {