Merge branch 'pcid_cleanup' into 'master'

Remove some dependencies of pcid

See merge request redox-os/drivers!228

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"
@@ -995,20 +968,15 @@ name = "pcid"
 version = "0.1.0"
 dependencies = [
  "bincode",
- "bit_field",
- "bitflags 1.3.2",
  "common",
  "fdt 0.1.5",
  "libc",
  "libredox",
  "log",
- "paw",
  "pci_types",
  "plain",
  "redox-daemon",
- "redox_syscall",
  "serde",
- "serde_json",
  "structopt",
  "thiserror",
  "toml 0.5.11",
@@ -1480,7 +1448,6 @@ checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
 dependencies = [
  "clap",
  "lazy_static",
- "paw",
  "structopt-derive",
 ]
 

pcid/Cargo.toml

@@ -13,19 +13,14 @@ path = "src/lib.rs"
 
 [dependencies]
 bincode = "1.2"
-bitflags = "1"
-bit_field = "0.10"
 fdt = "0.1.5"
 libc = "0.2"
 log = "0.4"
-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" ] }
+structopt = { version = "0.3", default-features = false }
 thiserror = "1"
 toml = "0.5"
 

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 {