From 5177ca3926cb948986e1276d5797c8f707d2b347 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Thu, 20 Jun 2024 15:52:26 +0200
Subject: [PATCH] Remove memoffset dependency.
---
Cargo.lock | 10 ----------
Cargo.toml | 1 -
src/ld_so/tcb.rs | 2 +-
src/lib.rs | 2 --
4 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 520d4c544..fc8e8ae2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -214,15 +214,6 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -408,7 +399,6 @@ dependencies = [
"libc",
"md-5",
"memchr",
- "memoffset",
"pbkdf2",
"plain",
"posix-regex",
diff --git a/Cargo.toml b/Cargo.toml
index f3c83b3af..031a2214b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ cc = "1"
[dependencies]
bitflags = "2"
cbitset = "0.2"
-memoffset = "0.9"
posix-regex = { path = "posix-regex", features = ["no_std"] }
# TODO: For some reason, rand_jitter hasn't been updated to use the latest rand_core
diff --git a/src/ld_so/tcb.rs b/src/ld_so/tcb.rs
index 2b012ea7f..ecd8fef49 100644
--- a/src/ld_so/tcb.rs
+++ b/src/ld_so/tcb.rs
@@ -1,6 +1,6 @@
use alloc::vec::Vec;
use syscall::Sigcontrol;
-use core::{arch::asm, cell::UnsafeCell, mem, ptr, slice, sync::atomic::AtomicBool};
+use core::{arch::asm, cell::UnsafeCell, mem::{self, offset_of}, ptr, slice, sync::atomic::AtomicBool};
use goblin::error::{Error, Result};
use super::ExpectTlsFree;
diff --git a/src/lib.rs b/src/lib.rs
index b44e17f9f..24afb6043 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,8 +31,6 @@ extern crate alloc;
extern crate cbitset;
extern crate goblin;
extern crate memchr;
-#[macro_use]
-extern crate memoffset;
extern crate posix_regex;
extern crate rand;
--
GitLab