use scryer-modular-bitfield on github, version bump

diff --git a/Cargo.lock b/Cargo.lock
index d4e697bb286ba4884f88e34f4595c955c85cfc16..5e406c6a6ca915851701bd65f3fed26609116db4 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1279,8 +1279,9 @@ dependencies = [
 
 [[package]]
 name = "iai-callgrind"
-version = "0.8.0"
-source = "git+https://github.com/iai-callgrind/iai-callgrind.git?rev=c77bc3c83d7f4e976cc42d4597236a8db259e772#c77bc3c83d7f4e976cc42d4597236a8db259e772"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebd67b0ae963bb8b800829320c264fcf71f821e3aed0c004ee252c99dbff3f7"
 dependencies = [
  "bincode",
  "iai-callgrind-macros",
@@ -1290,7 +1291,8 @@ dependencies = [
 [[package]]
 name = "iai-callgrind-macros"
 version = "0.1.0"
-source = "git+https://github.com/iai-callgrind/iai-callgrind.git?rev=c77bc3c83d7f4e976cc42d4597236a8db259e772#c77bc3c83d7f4e976cc42d4597236a8db259e772"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af5af66b85e350097b8c0f6329c6347d3323d010443475741c29a1a167f116fb"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -1300,9 +1302,11 @@ dependencies = [
 
 [[package]]
 name = "iai-callgrind-runner"
-version = "0.8.0"
-source = "git+https://github.com/iai-callgrind/iai-callgrind.git?rev=c77bc3c83d7f4e976cc42d4597236a8db259e772#c77bc3c83d7f4e976cc42d4597236a8db259e772"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a465e75ad1dfe0fbbb3ee22f5f7d5c077401e412059edb5f3856b1734668bee"
 dependencies = [
+ "lazy_static",
  "serde",
 ]
 
@@ -1650,25 +1654,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "modular-bitfield"
-version = "0.11.2"
-source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f"
-dependencies = [
- "modular-bitfield-impl",
- "static_assertions",
-]
-
-[[package]]
-name = "modular-bitfield-impl"
-version = "0.11.2"
-source = "git+https://github.com/mthom/modular-bitfield#213535c684af277563678179d8496f11b84a283f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "multer"
 version = "2.1.0"
@@ -2548,9 +2533,30 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[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.9.3"
+version = "0.9.4"
 dependencies = [
  "assert_cmd",
  "base64 0.12.3",
@@ -2583,7 +2589,6 @@ dependencies = [
  "libffi",
  "libloading",
  "maplit",
- "modular-bitfield",
  "native-tls",
  "num-order",
  "ordered-float",
@@ -2601,6 +2606,7 @@ dependencies = [
  "roxmltree",
  "rustyline",
  "ryu",
+ "scryer-modular-bitfield",
  "select",
  "serde",
  "serde-wasm-bindgen",

diff --git a/Cargo.toml b/Cargo.toml
index 461cba64cacfbbdf8b8a6e2b900eecbbda9ede17..2af52e257c882b5837cb4c0ac827f036f5dcb3c3 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scryer-prolog"
-version = "0.9.3"
+version = "0.9.4"
 authors = ["Mark Thom <[email protected]>"]
 edition = "2021"
 description = "A modern Prolog implementation written mostly in Rust."
@@ -57,7 +57,7 @@ lazy_static = "1.4.0"
 lexical = "5.2.2"
 libc = "0.2.62"
 libloading = "0.7"
-modular-bitfield = "0.11.2"
+scryer-modular-bitfield = "0.11.4"
 num-order = { version = "1.2.0" }
 ordered-float = "2.6.0"
 phf = { version = "0.9", features = ["macros"] }
@@ -118,15 +118,12 @@ serial_test = "2.0.0"
 [target.'cfg(not(all(target_arch = "wasm32", target_os = "unknown")))'.dev-dependencies]
 assert_cmd = "1.0.3"
 criterion = "0.5.1"
-iai-callgrind = { git = "https://github.com/iai-callgrind/iai-callgrind.git", rev = "c77bc3c83d7f4e976cc42d4597236a8db259e772" }
+iai-callgrind = "0.9.0"
 trycmd = "0.14.19"
 
 [target.'cfg(not(any(target_os = "windows", all(target_arch = "wasm32", target_os = "unknown"))))'.dev-dependencies]
 pprof = { version = "0.13.0", features = ["criterion", "flamegraph"] }
 
-[patch.crates-io]
-modular-bitfield = { git = "https://github.com/mthom/modular-bitfield" }
-
 [profile.bench]
 lto = true
 opt-level = 3

diff --git a/src/atom_table.rs b/src/atom_table.rs
index 3f60eca69b2c004561bfc606f6fc3f0e837a207f..6de8f5f9ac9f79978f41fb01018f22d1db549249 100644 (file)
--- a/src/atom_table.rs
+++ b/src/atom_table.rs
@@ -17,7 +17,7 @@ use std::sync::Weak;
 
 use indexmap::IndexSet;
 
-use modular_bitfield::prelude::*;
+use scryer_modular_bitfield::prelude::*;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct Atom {

diff --git a/src/heap_iter.rs b/src/heap_iter.rs
index cada66cfaa670dabf3ee9ac9605c4d62417838d2..024262f6aa8b214c2a1f5e6416135b4de04dd4d8 100644 (file)
--- a/src/heap_iter.rs
+++ b/src/heap_iter.rs
@@ -8,7 +8,7 @@ use crate::machine::stack::*;
 use crate::types::*;
 
 use core::marker::PhantomData;
-use modular_bitfield::prelude::*;
+use scryer_modular_bitfield::prelude::*;
 
 use std::ops::Deref;
 use std::vec::Vec;

diff --git a/src/machine/machine_indices.rs b/src/machine/machine_indices.rs
index e5fdc9558fc8903d43a2ca9672d4f073240bc6c5..e73611ec2bfadb7a5087cb694cf3578d937096f6 100644 (file)
--- a/src/machine/machine_indices.rs
+++ b/src/machine/machine_indices.rs
@@ -10,8 +10,8 @@ use crate::machine::ClauseType;
 
 use fxhash::FxBuildHasher;
 use indexmap::{IndexMap, IndexSet};
-use modular_bitfield::specifiers::*;
-use modular_bitfield::{bitfield, BitfieldSpecifier};
+use scryer_modular_bitfield::specifiers::*;
+use scryer_modular_bitfield::{bitfield, BitfieldSpecifier};
 
 use std::cmp::Ordering;
 use std::collections::BTreeSet;

diff --git a/src/machine/streams.rs b/src/machine/streams.rs
index e05ad9837904104a89296d498ceeb3af7073fe11..ba3659dd22785c527fed2ed33601c03c5767aec5 100644 (file)
--- a/src/machine/streams.rs
+++ b/src/machine/streams.rs
@@ -12,7 +12,7 @@ use crate::machine::machine_indices::*;
 use crate::machine::machine_state::*;
 use crate::types::*;
 
-pub use modular_bitfield::prelude::*;
+pub use scryer_modular_bitfield::prelude::*;
 
 use std::cmp::Ordering;
 use std::error::Error;

diff --git a/src/parser/ast.rs b/src/parser/ast.rs
index 04d6fc99cde2213fcdfe8d00dab6579e2326da73..82526ab458bb94faf2b63612429439fa49e1560c 100644 (file)
--- a/src/parser/ast.rs
+++ b/src/parser/ast.rs
@@ -17,8 +17,8 @@ use crate::parser::dashu::{Integer, Rational};
 
 use fxhash::FxBuildHasher;
 use indexmap::IndexMap;
-use modular_bitfield::error::OutOfBounds;
-use modular_bitfield::prelude::*;
+use scryer_modular_bitfield::error::OutOfBounds;
+use scryer_modular_bitfield::prelude::*;
 
 pub type Specifier = u32;
 
@@ -537,7 +537,7 @@ impl Fixnum {
 
     #[inline]
     pub fn get_tag(&self) -> HeapCellValueTag {
-        use modular_bitfield::Specifier;
+        use scryer_modular_bitfield::Specifier;
         HeapCellValueTag::from_bytes(self.tag()).unwrap()
     }