replace custom modular_bitfields fork with update upstream

part of #2468

diff --git a/Cargo.lock b/Cargo.lock
index 4fa6192577f0dbd486f711bde43090f10e925fac..a12cc878a0b81b322669a4f3f01ffba4d938126b 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1792,6 +1792,27 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "modular-bitfield"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2956e537fc68236d2aa048f55704f231cc93f1c4de42fe1ecb5bd7938061fc4a"
+dependencies = [
+ "modular-bitfield-impl",
+ "static_assertions",
+]
+
+[[package]]
+name = "modular-bitfield-impl"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "multer"
 version = "2.1.0"
@@ -2686,27 +2707,6 @@ dependencies = [
  "tendril",
 ]
 
-[[package]]
-name = "scryer-modular-bitfield"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f26c70c56d2c94a02545d86384b91994532c2be928c974784b603c2b1f76ac"
-dependencies = [
- "scryer-modular-bitfield-impl",
- "static_assertions",
-]
-
-[[package]]
-name = "scryer-modular-bitfield-impl"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212164841808ccfccf1b0471d91f8cfe675eeb60dbb96e4ca7a1f37b22570a29"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "scryer-prolog"
 version = "0.10.0"
@@ -2744,6 +2744,7 @@ dependencies = [
  "libffi",
  "libloading",
  "maplit",
+ "modular-bitfield",
  "native-tls",
  "num-order",
  "ordered-float",
@@ -2762,7 +2763,6 @@ dependencies = [
  "rustyline",
  "ryu",
  "scraper",
- "scryer-modular-bitfield",
  "serde",
  "serde-wasm-bindgen",
  "serde_json",
@@ -3177,7 +3177,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 

diff --git a/Cargo.toml b/Cargo.toml
index 5971a229a574d6fee602d9900e2d8b4eaa26f2f8..a4c6c645cac583105fab855cc7f13b30772ed716 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,7 +65,7 @@ lazy_static = "1.5.0"
 lexical = "7.0.4"
 libc = "0.2.155"
 libloading = "0.8"
-scryer-modular-bitfield = "0.11.4"
+modular-bitfield = "0.13.1"
 num-order = { version = "1.2.0" }
 ordered-float = "5.0.0"
 phf = { version = "0.11", features = ["macros"] }

diff --git a/_typos.toml b/_typos.toml
index dc829cd30d5baf3fe927fdd3b662b5f165749711..1e72f376c30c77780dec91d136ba1fb502885519 100644 (file)
--- a/_typos.toml
+++ b/_typos.toml
@@ -16,6 +16,10 @@ extend-ignore-re = [
 interm = "interm"
 IntermReg = "IntermReg"
 
+[type.rust]
+extend-glob = [ "*.rs" ]
+[type.rust.extend-identifiers]
+consts = "consts" # std::{f32,f64}::consts
 
 
 [type.prolog]

diff --git a/src/arena.rs b/src/arena.rs
index ab108e0297a0c03e01ae73826f785b424e3a5a07..fa6faaa0fb9a5aacf1eae979647f361249d1248a 100644 (file)
--- a/src/arena.rs
+++ b/src/arena.rs
@@ -52,7 +52,7 @@ where
     payload_offset - header_offset
 }
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq)]
 #[bits = 7]
 pub enum ArenaHeaderTag {
     Integer = 0b10,

diff --git a/src/atom_table.rs b/src/atom_table.rs
index 7a0a818e4972e477cda0d01ef7b2ea8deb14052a..aac2d8b54a05b3af18c08838062c1999791e97c6 100644 (file)
--- a/src/atom_table.rs
+++ b/src/atom_table.rs
@@ -23,7 +23,7 @@ use arcu::rcu_ref::RcuRef;
 use arcu::Rcu;
 use indexmap::IndexSet;
 
-use scryer_modular_bitfield::prelude::*;
+use modular_bitfield::prelude::*;
 
 #[bitfield]
 #[repr(u64)]

diff --git a/src/heap_iter.rs b/src/heap_iter.rs
index 903fcbc236d9fcbdb43b8dfd4629ce10bfa665c8..fed594510a6ee81a538215ee2df4be397f54d718 100644 (file)
--- a/src/heap_iter.rs
+++ b/src/heap_iter.rs
@@ -17,7 +17,7 @@ use crate::types::*;
 use core::marker::PhantomData;
 use fxhash::FxBuildHasher;
 use indexmap::IndexSet;
-use scryer_modular_bitfield::prelude::*;
+use modular_bitfield::prelude::*;
 use std::cmp::Ordering;
 
 use std::ops::Deref;
@@ -496,7 +496,7 @@ impl<'a> Iterator for EagerStackfulPreOrderHeapIter<'a> {
     }
 }
 
-#[derive(BitfieldSpecifier, Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Specifier, Clone, Copy, Debug, PartialEq, Eq)]
 #[bits = 2]
 enum IterStackLocTag {
     Iterable,
@@ -504,7 +504,7 @@ enum IterStackLocTag {
     PendingMark,
 }
 
-#[derive(BitfieldSpecifier, Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Specifier, Clone, Copy, Debug, PartialEq, Eq)]
 #[bits = 1]
 pub enum HeapOrStackTag {
     Heap,

diff --git a/src/machine/copier.rs b/src/machine/copier.rs
index 4de9a0c13656aba7c81dc874249d31088ea460f5..dc55ba26ee6695a7ebb0b2d31eb24e9feba28575 100644 (file)
--- a/src/machine/copier.rs
+++ b/src/machine/copier.rs
@@ -9,14 +9,14 @@ use crate::machine::heap::*;
 use crate::machine::stack::*;
 use crate::types::*;
 
-use scryer_modular_bitfield::specifiers::*;
-use scryer_modular_bitfield::*;
+use modular_bitfield::specifiers::*;
+use modular_bitfield::*;
 
 use std::collections::BTreeMap;
 use std::mem;
 use std::ops::{IndexMut, Range};
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug)]
+#[derive(Specifier, Copy, Clone, Debug)]
 #[bits = 6]
 enum TrailRefTag {
     HeapCell = 0b001011,

diff --git a/src/machine/machine_indices.rs b/src/machine/machine_indices.rs
index a2cb505083a61be4a743e88294cb3cf8f8bf5fb7..1036ec2a2a14efee36774e440ad5b1fba7e2385b 100644 (file)
--- a/src/machine/machine_indices.rs
+++ b/src/machine/machine_indices.rs
@@ -14,8 +14,8 @@ use crate::offset_table::*;
 
 use fxhash::FxBuildHasher;
 use indexmap::{IndexMap, IndexSet};
-use scryer_modular_bitfield::specifiers::*;
-use scryer_modular_bitfield::{bitfield, BitfieldSpecifier};
+use modular_bitfield::specifiers::*;
+use modular_bitfield::{bitfield, Specifier};
 
 use std::cmp::Ordering;
 use std::collections::BTreeSet;
@@ -66,7 +66,7 @@ impl PartialOrd<Ref> for HeapCellValue {
     }
 }
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq)]
 #[bits = 7]
 pub enum IndexPtrTag {
     DynamicUndefined = 0b1000101, // a predicate, declared as dynamic, whose location in code is as yet undefined.

diff --git a/src/machine/streams.rs b/src/machine/streams.rs
index 0d88ca5846cd61f590f285c812e97ab42d8d70d4..2151ba74cb121c6f2413391dbcb79cb81d733fbe 100644 (file)
--- a/src/machine/streams.rs
+++ b/src/machine/streams.rs
@@ -14,7 +14,7 @@ use crate::machine::machine_indices::*;
 use crate::machine::machine_state::*;
 use crate::types::*;
 
-pub use scryer_modular_bitfield::prelude::*;
+pub use modular_bitfield::prelude::*;
 
 #[cfg(feature = "http")]
 use bytes::{buf::Reader as BufReader, Buf, Bytes};
@@ -43,7 +43,7 @@ use warp::hyper;
 mod compat;
 pub use compat::*;
 
-#[derive(Debug, BitfieldSpecifier, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Specifier, Clone, Copy, PartialEq, Eq, Hash)]
 #[bits = 1]
 pub enum StreamType {
     Binary,
@@ -76,7 +76,7 @@ impl StreamType {
     }
 }
 
-#[derive(Debug, BitfieldSpecifier, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Specifier, Clone, Copy, PartialEq, Eq, Hash)]
 #[bits = 2]
 pub enum EOFAction {
     EOFCode,
@@ -84,7 +84,7 @@ pub enum EOFAction {
     Reset,
 }
 
-#[derive(Debug, BitfieldSpecifier, Copy, Clone, PartialEq)]
+#[derive(Debug, Specifier, Copy, Clone, PartialEq)]
 #[bits = 2]
 pub(crate) enum AtEndOfStream {
     Not,

diff --git a/src/parser/ast.rs b/src/parser/ast.rs
index ba18d36ede8d732627ea8ba8476216f5d4824a94..823d3270599c25e602434b108a244c916382d717 100644 (file)
--- a/src/parser/ast.rs
+++ b/src/parser/ast.rs
@@ -24,8 +24,8 @@ use dashu::Rational;
 use fxhash::FxBuildHasher;
 use indexmap::IndexMap;
 use ordered_float::OrderedFloat;
-use scryer_modular_bitfield::error::OutOfBounds;
-use scryer_modular_bitfield::prelude::*;
+use modular_bitfield::error::OutOfBounds;
+use modular_bitfield::prelude::*;
 
 pub type Specifier = u32;
 
@@ -671,7 +671,7 @@ impl Fixnum {
 
     #[inline]
     pub fn get_tag(&self) -> HeapCellValueTag {
-        use scryer_modular_bitfield::Specifier;
+        use modular_bitfield::Specifier;
         HeapCellValueTag::from_bytes(self.tag()).unwrap()
     }
 

diff --git a/src/types.rs b/src/types.rs
index 7cc843bc7a8cdb51f4a4ac3377271e80ece4bd97..8bb5b21132c3f38ef4a8f309b12c11d6b41848dc 100644 (file)
--- a/src/types.rs
+++ b/src/types.rs
@@ -19,7 +19,7 @@ use std::ops::{Add, Sub, SubAssign};
 
 use dashu::{Integer, Rational};
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[repr(u8)]
 #[bits = 6]
 pub enum HeapCellValueTag {
@@ -46,7 +46,7 @@ pub enum HeapCellValueTag {
     TrailedBlackboardOffset = 0b110001,
 }
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[repr(u8)]
 #[bits = 6]
 pub enum HeapCellValueView {
@@ -73,7 +73,7 @@ pub enum HeapCellValueView {
     TrailedBlackboardOffset = 0b110001,
 }
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[bits = 1]
 pub enum ConsPtrMaskTag {
     Cons = 0b0,
@@ -112,7 +112,7 @@ impl ConsPtr {
     }
 }
 
-#[derive(BitfieldSpecifier, Copy, Clone, Debug)]
+#[derive(Specifier, Copy, Clone, Debug)]
 #[bits = 6]
 pub(crate) enum RefTag {
     HeapCell = 0b001011,
@@ -199,7 +199,7 @@ pub enum TrailRef {
 }
 
 #[allow(clippy::enum_variant_names)] // allow the common "Trailed" prefix
-#[derive(BitfieldSpecifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Specifier, Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 #[bits = 6]
 pub(crate) enum TrailEntryTag {
     TrailedHeapVar = 0b101111,