Skip to content

Commit

Permalink
use scryer-modular-bitfield on github, version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
mthom committed Feb 29, 2024
1 parent 6417658 commit b70f121
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 40 deletions.
58 changes: 32 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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."
Expand Down Expand Up @@ -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"] }
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/atom_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/heap_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/machine/machine_indices.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/machine/streams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/parser/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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()
}

Expand Down

0 comments on commit b70f121

Please sign in to comment.