Skip to content

Remove dependency on memoffset #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrDIMAS merged 1 commit into from
Jul 8, 2026
+1 −5
Merged

Remove dependency on memoffset #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fyrox-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ fyrox-math = { path = "../fyrox-math", version = "2.0.0-rc.1" }
base64 = "0.22.1"
byteorder = "1.4.3"
rand = "0.8"
memoffset = "0.9.0"
nalgebra = { version = "0.35", features = ["bytemuck", "convert-glam030"] }
arrayvec = "0.7.2"
futures = { version = "0.3.17", features = ["thread-pool"] }
Expand Down
3 changes: 0 additions & 3 deletions fyrox-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
#![allow(clippy::doc_lazy_continuation)]
#![allow(mismatched_lifetime_syntaxes)]

#[macro_use]
extern crate memoffset;

pub use arrayvec;
pub use byteorder;
pub use nalgebra as algebra;
Expand Down
2 changes: 1 addition & 1 deletion fyrox-core/src/pool/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ where
let val = ptr as *const T as usize;
if val >= begin && val < end {
let record_size = std::mem::size_of::<PoolRecord<T>>();
let record_location = (val - offset_of!(PoolRecord<T>, payload)) - begin;
let record_location = (val - core::mem::offset_of!(PoolRecord<T>, payload)) - begin;
if record_location.is_multiple_of(record_size) {
let index = record_location / record_size;
let index = u32::try_from(index).expect("Index overflowed u32");
Expand Down
Loading