From 22cb0d71affb5801b8c413954677e41445303b65 Mon Sep 17 00:00:00 2001
From: Able <abl3theabove@gmail.com>
Date: Mon, 11 Apr 2022 15:34:40 -0500
Subject: [PATCH] fixes

---
 .gitignore           |  1 -
 Cargo.lock           | 45 ++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml           |  2 +-
 ableos/Cargo.toml    |  4 ++--
 qprofiler            |  1 +
 repbuild/Cargo.toml  |  5 ++++-
 repbuild/src/main.rs |  7 ++++---
 7 files changed, 57 insertions(+), 8 deletions(-)
 create mode 160000 qprofiler

diff --git a/.gitignore b/.gitignore
index 3a6c2180d..98fd79937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ ableos/target
 aos_wasm_stress_test/target
 facepalm/target
 shadeable/target
-qprofiler
 userland/*/target
 kernel/target
 userland/root_fs/mnt/*
diff --git a/Cargo.lock b/Cargo.lock
index a89be69c5..d4df9a169 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -181,13 +181,28 @@ checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c"
 dependencies = [
  "atty",
  "bitflags",
+ "clap_derive",
  "indexmap",
+ "lazy_static",
  "os_str_bytes",
  "strsim",
  "termcolor",
  "textwrap",
 ]
 
+[[package]]
+name = "clap_derive"
+version = "3.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "conquer-once"
 version = "0.3.2"
@@ -331,6 +346,12 @@ dependencies = [
  "ahash 0.7.6",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -560,6 +581,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131"
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.19"
diff --git a/Cargo.toml b/Cargo.toml
index ab539484b..7186043f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,5 +6,5 @@ members = [
     "facepalm",
     "shadeable",
     "repbuild",
-    
+
 ]
\ No newline at end of file
diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml
index 51f0dee8e..9e7c935d6 100644
--- a/ableos/Cargo.toml
+++ b/ableos/Cargo.toml
@@ -30,8 +30,8 @@ run-args = [
     # "-device",
     # "virtio-rng",
 
-    # "-qmp",
-    # "unix:../qmp-sock,server,nowait"
+    "-qmp",
+    "unix:../qmp-sock,server,nowait"
 
 ]
 test-args = [
diff --git a/qprofiler b/qprofiler
new file mode 160000
index 000000000..39f390680
--- /dev/null
+++ b/qprofiler
@@ -0,0 +1 @@
+Subproject commit 39f39068029fce6a94c7bd5cc960b07d9d1b2288
diff --git a/repbuild/Cargo.toml b/repbuild/Cargo.toml
index f4bef60ce..16eaa423f 100644
--- a/repbuild/Cargo.toml
+++ b/repbuild/Cargo.toml
@@ -5,6 +5,9 @@ edition = "2021"
 authors = ["Able", "NotAble"]
 
 [dependencies]
-clap = "3.0.0-beta.5"
 xshell = "0.1.9"
 anyhow = "*"
+
+[dependencies.clap]
+version = "3.1.8"
+features = ["derive"]
\ No newline at end of file
diff --git a/repbuild/src/main.rs b/repbuild/src/main.rs
index 9dfd24b7a..20cc69971 100644
--- a/repbuild/src/main.rs
+++ b/repbuild/src/main.rs
@@ -1,7 +1,8 @@
 use clap::Parser;
 
 #[derive(clap::Parser, Debug)]
-#[clap(version = clap::crate_version!(), author = clap::crate_authors!("\n"))]
+// #[clap(version = clap::crate_version!(), author = clap::crate_authors!("\n"))]
+
 /// Hello Remember this is a feature
 enum Command {
     Run {
@@ -103,12 +104,12 @@ fn main() -> anyhow::Result<()> {
         Command::Mount { path } => {
             let path = path.unwrap_or("./userland/root_fs/mnt".to_string());
             xshell::cmd!("sudo mount userland/root_fs/ext2.img {path}").run()?;
-        },
+        }
 
         Command::Unmount { path } => {
             let path = path.unwrap_or("./userland/root_fs/mnt".to_string());
             xshell::cmd!("sudo umount {path}").run()?;
-        },
+        }
     }
 
     Ok(())