From e6139319e8a6bbfcdf0fc3b4d71bbcd56c6421d2 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 30 Dec 2024 11:40:02 +0100
Subject: [PATCH 1/2] pcid: Remove a couple of unused dependencies

---
 Cargo.lock      | 4 ----
 pcid/Cargo.toml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 145efadb1d..03a983b183 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -995,8 +995,6 @@ name = "pcid"
 version = "0.1.0"
 dependencies = [
  "bincode",
- "bit_field",
- "bitflags 1.3.2",
  "common",
  "fdt 0.1.5",
  "libc",
@@ -1006,9 +1004,7 @@ dependencies = [
  "pci_types",
  "plain",
  "redox-daemon",
- "redox_syscall",
  "serde",
- "serde_json",
  "structopt",
  "thiserror",
  "toml 0.5.11",
diff --git a/pcid/Cargo.toml b/pcid/Cargo.toml
index 1bf295f8d4..0108db9c69 100644
--- a/pcid/Cargo.toml
+++ b/pcid/Cargo.toml
@@ -13,8 +13,6 @@ path = "src/lib.rs"
 
 [dependencies]
 bincode = "1.2"
-bitflags = "1"
-bit_field = "0.10"
 fdt = "0.1.5"
 libc = "0.2"
 log = "0.4"
@@ -22,9 +20,7 @@ paw = "1.0"
 pci_types = "0.10"
 plain = "0.2"
 redox-daemon = "0.1"
-redox_syscall = "0.5"
 serde = { version = "1", features = ["derive"] }
-serde_json = "1"
 structopt = { version = "0.3", default-features = false, features = [ "paw" ] }
 thiserror = "1"
 toml = "0.5"

From 898f8dc72befa770e666f2f7b6379bfa4cb71975 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Mon, 30 Dec 2024 11:41:34 +0100
Subject: [PATCH 2/2] pcid: Remove usage of paw

---
 Cargo.lock       | 29 -----------------------------
 pcid/Cargo.toml  |  3 +--
 pcid/src/main.rs |  5 +++--
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 03a983b183..57abb4719d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -953,33 +953,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "paw"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c0fc9b564dbc3dc2ed7c92c0c144f4de340aa94514ce2b446065417c4084e9"
-dependencies = [
- "paw-attributes",
- "paw-raw",
-]
-
-[[package]]
-name = "paw-attributes"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f35583365be5d148e959284f42526841917b7bfa09e2d1a7ad5dde2cf0eaa39"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "paw-raw"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0b59668fe80c5afe998f0c0bf93322bf2cd66cafeeb80581f291716f3467f2"
-
 [[package]]
 name = "pci_types"
 version = "0.10.0"
@@ -1000,7 +973,6 @@ dependencies = [
  "libc",
  "libredox",
  "log",
- "paw",
  "pci_types",
  "plain",
  "redox-daemon",
@@ -1476,7 +1448,6 @@ checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 dependencies = [
  "clap",
  "lazy_static",
- "paw",
  "structopt-derive",
 ]
 
diff --git a/pcid/Cargo.toml b/pcid/Cargo.toml
index 0108db9c69..6acfa7774a 100644
--- a/pcid/Cargo.toml
+++ b/pcid/Cargo.toml
@@ -16,12 +16,11 @@ bincode = "1.2"
 fdt = "0.1.5"
 libc = "0.2"
 log = "0.4"
-paw = "1.0"
 pci_types = "0.10"
 plain = "0.2"
 redox-daemon = "0.1"
 serde = { version = "1", features = ["derive"] }
-structopt = { version = "0.3", default-features = false, features = [ "paw" ] }
+structopt = { version = "0.3", default-features = false }
 thiserror = "1"
 toml = "0.5"
 
diff --git a/pcid/src/main.rs b/pcid/src/main.rs
index 231463df73..49fc2119dd 100644
--- a/pcid/src/main.rs
+++ b/pcid/src/main.rs
@@ -194,8 +194,9 @@ fn handle_parsed_header(
     }
 }
 
-#[paw::main]
-fn main(args: Args) {
+fn main() {
+    let args = Args::from_args();
+
     let mut config = Config::default();
 
     if let Some(config_path) = args.config_path {