diff --git a/src/attribute.rs b/src/attribute.rs index 5d290e1..7813c92 100644 --- a/src/attribute.rs +++ b/src/attribute.rs @@ -2,13 +2,13 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use core::iter::FusedIterator; +use core::mem::offset_of; use core::ops::Range; use core::{fmt, mem}; use crate::io::{Read, Seek}; use bitflags::bitflags; use enumn::N; -use memoffset::offset_of; use nt_string::u16strle::U16StrLe; use strum_macros::Display; diff --git a/src/boot_sector.rs b/src/boot_sector.rs index 5a984c1..a6f56b6 100644 --- a/src/boot_sector.rs +++ b/src/boot_sector.rs @@ -1,10 +1,9 @@ // Copyright 2021-2026 Colin Finck // SPDX-License-Identifier: MIT OR Apache-2.0 +use core::mem::offset_of; use core::ops::RangeInclusive; -use memoffset::offset_of; - use crate::error::{NtfsError, Result}; use crate::types::{Lcn, NtfsPosition}; use zerocopy::byteorder::LittleEndian; diff --git a/src/file.rs b/src/file.rs index 759c11e..d0962b5 100644 --- a/src/file.rs +++ b/src/file.rs @@ -4,10 +4,10 @@ use core::cmp::Ordering; use core::fmt; use core::num::NonZeroU64; +use core::mem::offset_of; use alloc::vec; use bitflags::bitflags; -use memoffset::offset_of; use nt_string::u16strle::U16StrLe; use crate::attribute::{ diff --git a/src/index_entry.rs b/src/index_entry.rs index e55b77b..6b1597e 100644 --- a/src/index_entry.rs +++ b/src/index_entry.rs @@ -3,12 +3,12 @@ use core::iter::FusedIterator; use core::marker::PhantomData; +use core::mem::offset_of; use core::ops::Range; use core::{fmt, mem}; use alloc::vec::Vec; use bitflags::bitflags; -use memoffset::offset_of; use crate::error::{NtfsError, Result}; use crate::file::NtfsFile; diff --git a/src/index_record.rs b/src/index_record.rs index ffc4306..41e1789 100644 --- a/src/index_record.rs +++ b/src/index_record.rs @@ -4,7 +4,7 @@ use core::ops::Range; use alloc::vec; -use memoffset::offset_of; +use core::mem::offset_of; use crate::attribute_value::NtfsAttributeValue; use crate::error::{NtfsError, Result}; diff --git a/src/record.rs b/src/record.rs index 4da9194..390bf16 100644 --- a/src/record.rs +++ b/src/record.rs @@ -1,10 +1,10 @@ // Copyright 2021-2026 Colin Finck // SPDX-License-Identifier: MIT OR Apache-2.0 -use core::mem; +use core::mem::{self, offset_of}; use alloc::vec::Vec; -use memoffset::{offset_of, span_of}; +use memoffset::span_of; use crate::error::{NtfsError, Result}; use crate::types::NtfsPosition; diff --git a/src/structured_values/index_root.rs b/src/structured_values/index_root.rs index 4ddf47f..387a975 100644 --- a/src/structured_values/index_root.rs +++ b/src/structured_values/index_root.rs @@ -2,8 +2,7 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 use core::ops::Range; - -use memoffset::offset_of; +use core::mem::offset_of; use crate::attribute::NtfsAttributeType; use crate::attribute_value::{NtfsAttributeValue, NtfsResidentAttributeValue};