Basic cleanup of C remnants

Author: CraftSpider

crates/engine_bibtex/README.md

@@ -17,15 +17,3 @@ project](https://tectonic-typesetting.github.io/en-US/). It provides the
 This crate does not currently provides any [Cargo features][features].
 
 [features]: https://doc.rust-lang.org/cargo/reference/features.html
-
-
-## Updating the generated header
-
-This crate exposes Rust functions to C/C++ code using a header file created by
-[cbindgen]. To update the header, run:
-
-[cbindgen]: https://github.com/eqrion/cbindgen/
-
-```sh
-cbindgen --output bibtex/bibtex_bindings.h
-```

crates/engine_bibtex/src/c_api/auxi.rs crates/engine_bibtex/src/auxi.rscrates/engine_bibtex/src/c_api/auxi.rs renamed to crates/engine_bibtex/src/auxi.rs

@@ -1,24 +1,21 @@
 use crate::{
-    c_api::{
-        bibs::BibData,
-        buffer::{BufTy, GlobalBuffer},
-        char_info::LexClass,
-        cite::CiteInfo,
-        exec::print_bst_name,
-        hash::HashData,
-        log::{
-            aux_end1_err_print, aux_end2_err_print, aux_err_illegal_another_print,
-            aux_err_no_right_brace_print, aux_err_print, aux_err_stuff_after_right_brace_print,
-            aux_err_white_space_in_argument_print, hash_cite_confusion, log_pr_bst_name,
-            print_a_pool_str, print_a_token, print_confusion, print_overflow, log_pr_aux_name,
-            print_aux_name, print_bib_name, write_log_file, write_logs, AuxTy,
-        },
-        peekable::{peekable_close, peekable_open, PeekableInput},
-        pool::StringPool,
-        scan::Scan,
-        AuxNumber, Bibtex, GlobalItems, StrIlk, StrNumber,
+    bibs::BibData,
+    buffer::{BufTy, GlobalBuffer},
+    char_info::LexClass,
+    cite::CiteInfo,
+    exec::print_bst_name,
+    hash::HashData,
+    log::{
+        aux_end1_err_print, aux_end2_err_print, aux_err_illegal_another_print,
+        aux_err_no_right_brace_print, aux_err_print, aux_err_stuff_after_right_brace_print,
+        aux_err_white_space_in_argument_print, hash_cite_confusion, log_pr_aux_name,
+        log_pr_bst_name, print_a_pool_str, print_a_token, print_aux_name, print_bib_name,
+        print_confusion, print_overflow, write_log_file, write_logs, AuxTy,
     },
-    BibtexError,
+    peekable::{peekable_close, peekable_open, PeekableInput},
+    pool::StringPool,
+    scan::Scan,
+    AuxNumber, Bibtex, BibtexError, GlobalItems, StrIlk, StrNumber,
 };
 use std::{cell::RefCell, ffi::CString, ptr, ptr::NonNull};
 use tectonic_bridge_core::FileFormat;
@@ -88,7 +85,7 @@ pub(crate) fn with_aux_mut<T>(f: impl FnOnce(&mut AuxData) -> T) -> T {
 }
 
 fn aux_bib_data_command(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     buffers: &mut GlobalBuffer,
     bibs: &mut BibData,
     aux: &AuxData,
@@ -161,7 +158,7 @@ fn aux_bib_data_command(
 }
 
 fn aux_bib_style_command(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     buffers: &mut GlobalBuffer,
     aux: &AuxData,
     pool: &mut StringPool,
@@ -232,7 +229,7 @@ fn aux_bib_style_command(
 }
 
 fn aux_citation_command(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     buffers: &mut GlobalBuffer,
     aux: &AuxData,
     pool: &mut StringPool,
@@ -334,7 +331,7 @@ fn aux_citation_command(
 }
 
 fn aux_input_command(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     buffers: &mut GlobalBuffer,
     aux: &mut AuxData,
     pool: &mut StringPool,
@@ -419,7 +416,7 @@ fn aux_input_command(
 }
 
 pub(crate) fn get_aux_command_and_process(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     globals.buffers.set_offset(BufTy::Base, 2, 0);
@@ -489,7 +486,7 @@ pub(crate) fn pop_the_aux_stack(ctx: &mut Bibtex<'_, '_>, aux: &mut AuxData) ->
 }
 
 pub(crate) fn last_check_for_aux_errors(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     aux: &AuxData,
     pool: &StringPool,
     cites: &mut CiteInfo,

crates/engine_bibtex/src/c_api/bibs.rs crates/engine_bibtex/src/bibs.rscrates/engine_bibtex/src/c_api/bibs.rs renamed to crates/engine_bibtex/src/bibs.rs

@@ -1,21 +1,18 @@
 use crate::{
-    c_api::{
-        buffer::{BufTy, GlobalBuffer},
-        char_info::LexClass,
-        cite::add_database_cite,
-        hash::{FnClass, HashData},
-        log::{
-            bib_cmd_confusion, bib_equals_sign_print, bib_err_print, bib_id_print,
-            bib_one_of_two_print, bib_warn_print, cite_key_disappeared_confusion, eat_bib_print,
-            hash_cite_confusion, print_a_token, print_confusion, write_log_file, write_logs,
-        },
-        peekable::{input_ln, PeekableInput},
-        pool::StringPool,
-        scan::{scan_and_store_the_field_value_and_eat_white, scan_identifier, Scan, ScanRes},
-        xbuf::XBuf,
-        BibNumber, Bibtex, CiteNumber, GlobalItems, HashPointer, StrIlk, StrNumber,
+    buffer::{BufTy, GlobalBuffer},
+    char_info::LexClass,
+    cite::add_database_cite,
+    hash::{FnClass, HashData},
+    log::{
+        bib_cmd_confusion, bib_equals_sign_print, bib_err_print, bib_id_print,
+        bib_one_of_two_print, bib_warn_print, cite_key_disappeared_confusion, eat_bib_print,
+        hash_cite_confusion, print_a_token, print_confusion, write_log_file, write_logs,
     },
-    BibtexError,
+    peekable::{input_ln, PeekableInput},
+    pool::StringPool,
+    scan::{scan_and_store_the_field_value_and_eat_white, scan_identifier, Scan, ScanRes},
+    xbuf::XBuf,
+    BibNumber, Bibtex, BibtexError, CiteNumber, GlobalItems, HashPointer, StrIlk, StrNumber,
 };
 use std::{cell::RefCell, ptr::NonNull};
 
@@ -181,7 +178,7 @@ pub(crate) fn compress_bib_white(
 //       - tied to that, command_num is only used when at_bib_command is true
 //       - There's some messed up control flow that's porting weird `goto` style, can probably be simplified
 pub(crate) fn get_bib_command_or_entry_and_process(
-    ctx: &Bibtex,
+    ctx: &Bibtex<'_, '_>,
     globals: &mut GlobalItems<'_>,
     cur_macro_loc: &mut HashPointer,
     field_name_loc: &mut HashPointer,

crates/engine_bibtex/src/c_api/bst.rs crates/engine_bibtex/src/bst.rscrates/engine_bibtex/src/c_api/bst.rs renamed to crates/engine_bibtex/src/bst.rs

@@ -1,26 +1,23 @@
 use crate::{
-    c_api::{
-        bibs::get_bib_command_or_entry_and_process,
-        buffer::{BufTy, GlobalBuffer},
-        char_info::LexClass,
-        cite::find_cite_locs_for_this_cite_key,
-        exec::{check_command_execution, execute_fn, ExecCtx},
-        hash::{FnClass, HashData},
-        history::mark_warning,
-        log::{
-            already_seen_function_print, bst_err_print_and_look_for_blank_line, bst_id_print,
-            bst_left_brace_print, bst_right_brace_print, bst_warn_print,
-            cite_key_disappeared_confusion, eat_bst_print, hash_cite_confusion, log_pr_bib_name,
-            print_a_token, print_confusion, print_missing_entry, rs_bad_cross_reference_print,
-            rs_nonexistent_cross_reference_error, print_bib_name, rs_print_fn_class,
-            write_log_file, write_logs,
-        },
-        peekable::{peekable_close, tectonic_eof},
-        pool::StringPool,
-        scan::{eat_bst_white_space, scan_fn_def, scan_identifier, Scan, ScanRes},
-        Bibtex, CiteNumber, GlobalItems, HashPointer, StrIlk,
+    bibs::get_bib_command_or_entry_and_process,
+    buffer::{BufTy, GlobalBuffer},
+    char_info::LexClass,
+    cite::find_cite_locs_for_this_cite_key,
+    exec::{check_command_execution, execute_fn, ExecCtx},
+    hash::{FnClass, HashData},
+    history::mark_warning,
+    log::{
+        already_seen_function_print, bst_err_print_and_look_for_blank_line, bst_id_print,
+        bst_left_brace_print, bst_right_brace_print, bst_warn_print,
+        cite_key_disappeared_confusion, eat_bst_print, hash_cite_confusion, log_pr_bib_name,
+        print_a_token, print_bib_name, print_confusion, print_missing_entry,
+        rs_bad_cross_reference_print, rs_nonexistent_cross_reference_error, rs_print_fn_class,
+        write_log_file, write_logs,
     },
-    BibtexError,
+    peekable::{peekable_close, tectonic_eof},
+    pool::StringPool,
+    scan::{eat_bst_white_space, scan_fn_def, scan_identifier, Scan, ScanRes},
+    Bibtex, BibtexError, CiteNumber, GlobalItems, HashPointer, StrIlk,
 };
 use std::ptr::NonNull;
 
@@ -85,7 +82,10 @@ macro_rules! bst_ident {
     };
 }
 
-fn bst_entry_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<(), BibtexError> {
+fn bst_entry_command(
+    ctx: &mut ExecCtx<'_, '_, '_>,
+    globals: &mut GlobalItems<'_>,
+) -> Result<(), BibtexError> {
     if ctx.glbl_ctx().entry_seen {
         write_logs("Illegal, another entry command");
         bst_err_print_and_look_for_blank_line(ctx.glbl_ctx_mut(), globals.buffers, globals.pool)?;
@@ -226,7 +226,7 @@ fn bst_entry_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result
 }
 
 fn bst_execute_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     if !ctx.glbl_ctx().read_seen {
@@ -272,7 +272,7 @@ fn bst_execute_command(
 }
 
 fn bst_function_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     eat_bst_white!(ctx, globals, "function");
@@ -329,7 +329,7 @@ fn bst_function_command(
 }
 
 fn bst_integers_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     eat_bst_white!(ctx, globals, "integers");
@@ -373,7 +373,7 @@ fn bst_integers_command(
 }
 
 fn bst_iterate_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     if !ctx.glbl_ctx().read_seen {
@@ -422,7 +422,10 @@ fn bst_iterate_command(
     Ok(())
 }
 
-fn bst_macro_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<(), BibtexError> {
+fn bst_macro_command(
+    ctx: &mut ExecCtx<'_, '_, '_>,
+    globals: &mut GlobalItems<'_>,
+) -> Result<(), BibtexError> {
     if ctx.glbl_ctx().read_seen {
         write_logs("Illegal, macro command after read command");
         bst_err_print_and_look_for_blank_line(ctx.glbl_ctx_mut(), globals.buffers, globals.pool)?;
@@ -502,7 +505,10 @@ fn bst_macro_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result
     Ok(())
 }
 
-fn bst_read_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<(), BibtexError> {
+fn bst_read_command(
+    ctx: &mut ExecCtx<'_, '_, '_>,
+    globals: &mut GlobalItems<'_>,
+) -> Result<(), BibtexError> {
     if ctx.glbl_ctx().read_seen {
         write_logs("Illegal, another read command");
         bst_err_print_and_look_for_blank_line(ctx.glbl_ctx_mut(), globals.buffers, globals.pool)?;
@@ -579,7 +585,12 @@ fn bst_read_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<
             )?;
         }
         // SAFETY: take_cur_bib_file returns reference to which we're the last owner
-        unsafe { peekable_close(ctx.glbl_ctx_mut(), globals.bibs.take_cur_bib_file().map(NonNull::from)) };
+        unsafe {
+            peekable_close(
+                ctx.glbl_ctx_mut(),
+                globals.bibs.take_cur_bib_file().map(NonNull::from),
+            )
+        };
         globals.bibs.set_ptr(globals.bibs.ptr() + 1);
     }
 
@@ -783,7 +794,7 @@ fn bst_read_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<
 }
 
 fn bst_reverse_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     if !ctx.glbl_ctx().read_seen {
@@ -831,7 +842,10 @@ fn bst_reverse_command(
     Ok(())
 }
 
-fn bst_sort_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<(), BibtexError> {
+fn bst_sort_command(
+    ctx: &mut ExecCtx<'_, '_, '_>,
+    globals: &mut GlobalItems<'_>,
+) -> Result<(), BibtexError> {
     if !ctx.glbl_ctx().read_seen {
         write_logs("Illegal, sort command before read command");
         bst_err_print_and_look_for_blank_line(ctx.glbl_ctx_mut(), globals.buffers, globals.pool)?;
@@ -848,7 +862,7 @@ fn bst_sort_command(ctx: &mut ExecCtx, globals: &mut GlobalItems<'_>) -> Result<
 }
 
 fn bst_strings_command(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     eat_bst_white!(ctx, globals, "strings");
@@ -904,7 +918,7 @@ fn bst_strings_command(
 }
 
 fn bad_argument_token(
-    ctx: &mut Bibtex,
+    ctx: &mut Bibtex<'_, '_>,
     fn_out: Option<&mut HashPointer>,
     buffers: &mut GlobalBuffer,
     pool: &StringPool,
@@ -937,7 +951,7 @@ fn bad_argument_token(
 }
 
 pub(crate) fn get_bst_command_and_process(
-    ctx: &mut ExecCtx,
+    ctx: &mut ExecCtx<'_, '_, '_>,
     globals: &mut GlobalItems<'_>,
 ) -> Result<(), BibtexError> {
     let init = globals.buffers.init(BufTy::Base);

crates/engine_bibtex/src/c_api/buffer.rs crates/engine_bibtex/src/buffer.rscrates/engine_bibtex/src/c_api/buffer.rs renamed to crates/engine_bibtex/src/buffer.rs

@@ -1,4 +1,4 @@
-use crate::c_api::{
+use crate::{
     xbuf::{SafelyZero, XBuf},
     ASCIICode, BufPointer,
 };
@@ -211,10 +211,8 @@ impl GlobalBuffer {
     }
 }
 
-/// cbindgen:rename-all=ScreamingSnakeCase
 #[derive(Copy, Clone, Debug, PartialEq)]
-#[repr(C)]
-pub enum BufTy {
+pub(crate) enum BufTy {
     Base,
     Sv,
     Ex,

…tes/engine_bibtex/src/c_api/char_info.rs crates/engine_bibtex/src/char_info.rscrates/engine_bibtex/src/c_api/char_info.rs renamed to crates/engine_bibtex/src/char_info.rs crates/engine_bibtex/src/c_api/char_info.rs renamed to crates/engine_bibtex/src/char_info.rs

@@ -1,4 +1,4 @@
-use crate::c_api::ASCIICode;
+use crate::ASCIICode;
 
 macro_rules! const_for {
     ($start:literal..$end:literal => $arr:ident[..] = $expr:expr) => {
@@ -19,17 +19,14 @@ macro_rules! const_for {
 
 /// The lexer class of a character - this represents whether the parser considers it to be alphabetic,
 /// numeric, etc. Illegal represents tokens that shouldn't show up at all, such as ASCII backspace.
-///
-/// cbindgen:rename-all=ScreamingSnakeCase
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
-#[repr(C)]
-pub enum LexClass {
-    Illegal = 0,
-    Whitespace = 1,
-    Alpha = 2,
-    Numeric = 3,
-    Sep = 4,
-    Other = 5,
+pub(crate) enum LexClass {
+    Illegal,
+    Whitespace,
+    Alpha,
+    Numeric,
+    Sep,
+    Other,
 }
 
 impl LexClass {
@@ -40,13 +37,10 @@ impl LexClass {
 }
 
 /// Whether a token counts as valid in an identifier
-///
-/// cbindgen:rename-all=ScreamingSnakeCase
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
-#[repr(C)]
-pub enum IdClass {
-    IllegalIdChar = 0,
-    LegalIdChar = 1,
+pub(crate) enum IdClass {
+    IllegalIdChar,
+    LegalIdChar,
 }
 
 impl IdClass {