Use libredox::protocol in ipcd and netstack

Cargo.lock

@@ -888,11 +888,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "generic-rt"
-version = "0.1.0"
-source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#02ac27bf4bf493b9a736f66dee681a0cece1c43d"
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -917,17 +912,6 @@ dependencies = [
  "wasip3",
 ]
 
-[[package]]
-name = "goblin"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27c1b4369c2cd341b5de549380158b105a04c331be5db9110eef7b6d2742134"
-dependencies = [
- "log",
- "plain",
- "scroll 0.11.0",
-]
-
 [[package]]
 name = "gpt"
 version = "3.1.0"
@@ -1169,7 +1153,6 @@ dependencies = [
  "libc",
  "libredox",
  "rand 0.8.5",
- "redox-rt",
  "redox-scheme",
  "redox_event",
  "redox_syscall 0.7.3",
@@ -1476,7 +1459,7 @@ name = "partitionlib"
 version = "0.1.0"
 dependencies = [
  "gpt",
- "scroll 0.10.2",
+ "scroll",
  "uuid",
 ]
 
@@ -1822,27 +1805,6 @@ dependencies = [
  "termion",
 ]
 
-[[package]]
-name = "redox-path"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436d45c2b6a5b159d43da708e62b25be3a4a3d5550d654b72216ade4c4bfd717"
-
-[[package]]
-name = "redox-rt"
-version = "0.1.0"
-source = "git+https://gitlab.redox-os.org/redox-os/relibc.git#02ac27bf4bf493b9a736f66dee681a0cece1c43d"
-dependencies = [
- "bitflags 2.11.0",
- "generic-rt",
- "goblin",
- "ioslice",
- "libredox",
- "plain",
- "redox-path",
- "redox_syscall 0.7.3",
-]
-
 [[package]]
 name = "redox-scheme"
 version = "0.11.0"
@@ -1872,7 +1834,6 @@ dependencies = [
  "libredox",
  "log",
  "redox-log",
- "redox-rt",
  "redox-scheme",
  "redox_event",
  "redox_syscall 0.7.3",
@@ -2057,16 +2018,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec"
 dependencies = [
- "scroll_derive 0.10.5",
-]
-
-[[package]]
-name = "scroll"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
-dependencies = [
- "scroll_derive 0.11.1",
+ "scroll_derive",
 ]
 
 [[package]]
@@ -2080,17 +2032,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "scroll_derive"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "sdl2"
 version = "0.38.0"

ipcd/Cargo.toml

@@ -13,8 +13,5 @@ anyhow.workspace = true
 libc.workspace = true
 rand = { version = "0.8", features = ["small_rng"] }
 
-[target.'cfg(target_os = "redox")'.dependencies]
-redox-rt = { workspace = true, default-features = false }
-
 [lints]
 workspace = true

ipcd/src/uds/dgram.rs

@@ -6,9 +6,9 @@ use super::{
 };
 
 use libc::{AF_UNIX, SO_DOMAIN, SO_PASSCRED};
+use libredox::protocol::SocketCall;
 use rand::rngs::SmallRng;
 use rand::{RngCore, SeedableRng};
-use redox_rt::protocol::SocketCall;
 use redox_scheme::{
     scheme::SchemeSync, CallerCtx, OpenResult, RecvFdRequest, Response, SendFdRequest,
     SignalBehavior, Socket as SchemeSocket,

ipcd/src/uds/mod.rs

@@ -1,4 +1,4 @@
-use redox_rt::protocol::ProcMeta;
+use libredox::protocol::ProcMeta;
 use std::fmt::Debug;
 use std::{cmp, convert::TryInto, mem};
 use syscall::{error::*, Error};

ipcd/src/uds/stream.rs

@@ -6,8 +6,8 @@ use super::{
 };
 
 use libc::{ucred, AF_UNIX};
+use libredox::protocol::SocketCall;
 use rand::prelude::*;
-use redox_rt::protocol::SocketCall;
 use redox_scheme::{
     scheme::SchemeSync, CallerCtx, OpenResult, RecvFdRequest, Response, SendFdRequest,
     SignalBehavior, Socket as SchemeSocket,

netstack/Cargo.toml

@@ -34,8 +34,5 @@ features = [
 ]
 #For debugging: "log", "verbose"
 
-[target.'cfg(target_os = "redox")'.dependencies]
-redox-rt = { workspace = true, default-features = false }
-
 [lints]
 workspace = true

netstack/src/scheme/socket.rs

@@ -10,7 +10,7 @@ use std::rc::Rc;
 use std::str;
 
 use libredox::flag::CLOCK_MONOTONIC;
-use redox_rt::protocol::SocketCall;
+use libredox::protocol::SocketCall;
 use redox_scheme::{
     scheme::{register_scheme_inner, Op, SchemeSync},
     CallerCtx, OpenResult, Socket,