diff options
author | Mark <markjordanthom@gmail.com> | 2024-02-29 10:08:08 -0700 |
---|---|---|
committer | Mark <markjordanthom@gmail.com> | 2024-02-29 10:08:14 -0700 |
commit | b70f121e46112301c50fea43b768ec55d0954e54 (patch) | |
tree | ebef123e65bc4c065b695c076a8ebaecf603b712 | |
parent | 641765858f104ed9a87ed78dbf9d9298a6996853 (diff) |
use scryer-modular-bitfield on github, version bumpv0.9.4
-rw-r--r-- | Cargo.lock | 58 | ||||
-rw-r--r-- | Cargo.toml | 9 | ||||
-rw-r--r-- | src/atom_table.rs | 2 | ||||
-rw-r--r-- | src/heap_iter.rs | 2 | ||||
-rw-r--r-- | src/machine/machine_indices.rs | 4 | ||||
-rw-r--r-- | src/machine/streams.rs | 2 | ||||
-rw-r--r-- | src/parser/ast.rs | 6 |
7 files changed, 43 insertions, 40 deletions
@@ -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", ] @@ -1651,25 +1655,6 @@ dependencies = [ ] [[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" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2549,8 +2534,29 @@ 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", @@ -1,6 +1,6 @@ [package] name = "scryer-prolog" -version = "0.9.3" +version = "0.9.4" authors = ["Mark Thom <markjordanthom@gmail.com>"] 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 3f60eca6..6de8f5f9 100644 --- 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 cada66cf..024262f6 100644 --- 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 e5fdc955..e73611ec 100644 --- 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 e05ad983..ba3659dd 100644 --- 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 04d6fc99..82526ab4 100644 --- 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() } |