Minor cleanups - remove thread locals, improve history, directly import functions

Author: CraftSpider

crates/engine_bibtex/src/auxi.rs

@@ -17,7 +17,7 @@ use crate::{
     scan::Scan,
     Bibtex, BibtexError, GlobalItems, StrIlk, StrNumber,
 };
-use std::{cell::RefCell, ffi::CString, ptr::NonNull};
+use std::{ffi::CString, ptr::NonNull};
 use tectonic_bridge_core::FileFormat;
 
 const AUX_STACK_SIZE: usize = 20;
@@ -33,7 +33,7 @@ pub(crate) struct AuxData {
 }
 
 impl AuxData {
-    fn new() -> AuxData {
+    pub fn new() -> AuxData {
         AuxData { aux: Vec::new() }
     }
 
@@ -59,18 +59,6 @@ impl AuxData {
     }
 }
 
-thread_local! {
-    static AUX: RefCell<AuxData> = RefCell::new(AuxData::new());
-}
-
-pub fn reset() {
-    AUX.with(|aux| *aux.borrow_mut() = AuxData::new());
-}
-
-pub(crate) fn with_aux_mut<T>(f: impl FnOnce(&mut AuxData) -> T) -> T {
-    AUX.with(|aux| f(&mut aux.borrow_mut()))
-}
-
 fn aux_bib_data_command(
     ctx: &mut Bibtex<'_, '_>,
     buffers: &mut GlobalBuffer,

crates/engine_bibtex/src/bibs.rs

@@ -14,7 +14,7 @@ use crate::{
     xbuf::XBuf,
     BibNumber, Bibtex, BibtexError, CiteNumber, GlobalItems, HashPointer, StrIlk, StrNumber,
 };
-use std::{cell::RefCell, ptr::NonNull};
+use std::ptr::NonNull;
 
 const MAX_BIB_FILES: usize = 20;
 
@@ -28,7 +28,7 @@ pub(crate) struct BibData {
 }
 
 impl BibData {
-    fn new() -> BibData {
+    pub fn new() -> BibData {
         BibData {
             bib_file: XBuf::new(MAX_BIB_FILES),
             bib_list: XBuf::new(MAX_BIB_FILES),
@@ -110,18 +110,6 @@ impl BibData {
     }
 }
 
-thread_local! {
-    static BIBS: RefCell<BibData> = RefCell::new(BibData::new());
-}
-
-pub(crate) fn with_bibs_mut<T>(f: impl FnOnce(&mut BibData) -> T) -> T {
-    BIBS.with(|bibs| f(&mut bibs.borrow_mut()))
-}
-
-pub fn reset() {
-    BIBS.with(|bibs| *bibs.borrow_mut() = BibData::new());
-}
-
 pub(crate) fn eat_bib_white_space(buffers: &mut GlobalBuffer, bibs: &mut BibData) -> bool {
     let mut init = buffers.init(BufTy::Base);
     while !Scan::new()

crates/engine_bibtex/src/buffer.rs

@@ -2,22 +2,10 @@ use crate::{
     xbuf::{SafelyZero, XBuf},
     ASCIICode, BufPointer,
 };
-use std::{cell::RefCell, slice};
+use std::slice;
 
 pub(crate) const BUF_SIZE: usize = 20000;
 
-thread_local! {
-    static GLOBAL_BUFFERS: RefCell<GlobalBuffer> = RefCell::new(GlobalBuffer::new());
-}
-
-pub(crate) fn reset() {
-    GLOBAL_BUFFERS.with(|cell| *cell.borrow_mut() = GlobalBuffer::new());
-}
-
-pub(crate) fn with_buffers_mut<T>(f: impl FnOnce(&mut GlobalBuffer) -> T) -> T {
-    GLOBAL_BUFFERS.with(|buffers| f(&mut buffers.borrow_mut()))
-}
-
 struct Buffer<T: SafelyZero + 'static, const N: usize> {
     ptr: XBuf<T>,
     /// Stateful offsets into the buffer

crates/engine_bibtex/src/cite.rs

@@ -2,7 +2,7 @@ use crate::{
     entries::EntryData, hash::HashData, other::OtherData, pool::StringPool, xbuf::XBuf, CiteNumber,
     FindCiteLocs, HashPointer, StrIlk, StrNumber,
 };
-use std::{cell::RefCell, cmp::Ordering, ops::IndexMut};
+use std::{cmp::Ordering, ops::IndexMut};
 
 pub(crate) const MAX_CITES: usize = 750;
 
@@ -20,7 +20,7 @@ pub(crate) struct CiteInfo {
 }
 
 impl CiteInfo {
-    fn new() -> CiteInfo {
+    pub fn new() -> CiteInfo {
         CiteInfo {
             cite_list: XBuf::new(MAX_CITES),
             cite_info: XBuf::new(MAX_CITES),
@@ -125,18 +125,6 @@ impl CiteInfo {
     }
 }
 
-thread_local! {
-    static CITE_INFO: RefCell<CiteInfo> = RefCell::new(CiteInfo::new());
-}
-
-pub fn reset() {
-    CITE_INFO.with(|ci| *ci.borrow_mut() = CiteInfo::new());
-}
-
-pub(crate) fn with_cites_mut<T>(f: impl FnOnce(&mut CiteInfo) -> T) -> T {
-    CITE_INFO.with(|ci| f(&mut ci.borrow_mut()))
-}
-
 fn less_than(entries: &EntryData, arg1: &CiteNumber, arg2: &CiteNumber) -> Ordering {
     let ptr1 = arg1 * entries.num_ent_strs() + entries.sort_key_num();
     let ptr2 = arg2 * entries.num_ent_strs() + entries.sort_key_num();

crates/engine_bibtex/src/entries.rs

@@ -1,5 +1,4 @@
 use crate::{cite::CiteInfo, xbuf::XBuf, ASCIICode};
-use std::cell::RefCell;
 
 pub(crate) const ENT_STR_SIZE: usize = 250;
 
@@ -12,7 +11,7 @@ pub(crate) struct EntryData {
 }
 
 impl EntryData {
-    fn new() -> EntryData {
+    pub fn new() -> EntryData {
         EntryData {
             num_entry_ints: 0,
             num_entry_strs: 0,
@@ -83,15 +82,3 @@ impl EntryData {
         self.entry_strs = Some(new_buf);
     }
 }
-
-thread_local! {
-    static ENTRIES: RefCell<EntryData> = RefCell::new(EntryData::new());
-}
-
-pub fn reset() {
-    ENTRIES.with(|entries| *entries.borrow_mut() = EntryData::new());
-}
-
-pub(crate) fn with_entries_mut<T>(f: impl FnOnce(&mut EntryData) -> T) -> T {
-    ENTRIES.with(|entries| f(&mut entries.borrow_mut()))
-}

crates/engine_bibtex/src/global.rs

@@ -1,5 +1,4 @@
 use crate::{xbuf::XBuf, ASCIICode, StrNumber};
-use std::cell::RefCell;
 
 const MAX_GLOB_STRS: usize = 10;
 pub(crate) const GLOB_STR_SIZE: usize = 20000;
@@ -12,7 +11,7 @@ pub(crate) struct GlobalData {
 }
 
 impl GlobalData {
-    fn new() -> GlobalData {
+    pub fn new() -> GlobalData {
         GlobalData {
             glb_bib_str_ptr: XBuf::new(MAX_GLOB_STRS),
             global_strs: XBuf::new((GLOB_STR_SIZE + 1) * MAX_GLOB_STRS),
@@ -58,15 +57,3 @@ impl GlobalData {
         self.glb_bib_str_ptr.len()
     }
 }
-
-thread_local! {
-    static GLOBALS: RefCell<GlobalData> = RefCell::new(GlobalData::new());
-}
-
-pub fn reset() {
-    GLOBALS.with(|globals| *globals.borrow_mut() = GlobalData::new());
-}
-
-pub(crate) fn with_globals_mut<T>(f: impl FnOnce(&mut GlobalData) -> T) -> T {
-    GLOBALS.with(|globals| f(&mut globals.borrow_mut()))
-}

crates/engine_bibtex/src/hash.rs

@@ -3,7 +3,6 @@ use crate::{
     xbuf::{SafelyZero, XBuf},
     HashPointer, StrIlk, StrNumber,
 };
-use std::cell::RefCell;
 
 pub(crate) const HASH_BASE: usize = 1;
 pub(crate) const HASH_SIZE: usize = if pool::MAX_STRINGS > 5000 {
@@ -161,15 +160,3 @@ impl HashData {
         self.ilk_info[pos] = info;
     }
 }
-
-thread_local! {
-    static HASHES: RefCell<HashData> = RefCell::new(HashData::new());
-}
-
-pub fn reset() {
-    HASHES.with(|hash| *hash.borrow_mut() = HashData::new());
-}
-
-pub(crate) fn with_hash_mut<T>(f: impl FnOnce(&mut HashData) -> T) -> T {
-    HASHES.with(|h| f(&mut h.borrow_mut()))
-}

crates/engine_bibtex/src/history.rs

@@ -3,27 +3,17 @@ use std::cell::Cell;
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
 pub enum History {
     Spotless,
-    WarningIssued,
-    ErrorIssued,
+    WarningIssued(u32),
+    ErrorIssued(u32),
     FatalError,
 }
 
 thread_local! {
     static HISTORY: Cell<History> = Cell::new(History::Spotless);
-    static ERR_COUNT: Cell<u32> = Cell::new(0);
 }
 
 pub(crate) fn reset() {
     HISTORY.with(|cell| cell.set(History::Spotless));
-    ERR_COUNT.with(|cell| cell.set(0));
-}
-
-fn get_err() -> u32 {
-    ERR_COUNT.with(|e| e.get())
-}
-
-fn set_err(f: impl FnOnce(u32) -> u32) {
-    ERR_COUNT.with(|e| e.set(f(e.get())))
 }
 
 pub(crate) fn get_history() -> History {
@@ -35,28 +25,21 @@ pub(crate) fn set_history(hist: History) {
 }
 
 pub(crate) fn mark_warning() {
-    let history = get_history();
-    if history == History::WarningIssued {
-        set_err(|e| e + 1);
-    } else if history == History::Spotless {
-        set_history(History::WarningIssued);
-        set_err(|_| 1);
+    match get_history() {
+        History::WarningIssued(cur) => set_history(History::WarningIssued(cur + 1)),
+        History::Spotless => set_history(History::WarningIssued(1)),
+        _ => (),
     }
 }
 
 pub(crate) fn mark_error() {
-    if get_history() < History::ErrorIssued {
-        set_history(History::ErrorIssued);
-        set_err(|_| 1);
-    } else {
-        set_err(|e| e + 1);
+    match get_history() {
+        History::Spotless | History::WarningIssued(_) => set_history(History::ErrorIssued(1)),
+        History::ErrorIssued(cur) => set_history(History::ErrorIssued(cur + 1)),
+        _ => (),
     }
 }
 
 pub fn mark_fatal() {
     set_history(History::FatalError);
 }
-
-pub fn err_count() -> u32 {
-    get_err()
-}