move trace-dump into trace (xi-editor#1156)

* move trace-dump into trace

* run rustfmt

rust/.gitignore

@@ -4,3 +4,6 @@
 *.rs.bk
 target
 build
+
+# Editor configs
+.idea/

rust/Cargo.toml

@@ -33,7 +33,6 @@ members = [
   "sample-plugin",
   "syntect-plugin",
   "trace",
-  "trace-dump",
   "unicode",
 ]
 

rust/core-lib/Cargo.toml

@@ -19,7 +19,6 @@ regex = "1.0"
 memchr = "2.0.1"
 
 xi-trace = { path = "../trace", version = "0.1.0" }
-xi-trace-dump = { path = "../trace-dump", version = "0.1.0" }
 xi-rope = { path = "../rope", version = "0.3" }
 xi-unicode = { path = "../unicode", version = "0.1.0" }
 xi-rpc = { path = "../rpc", version = "0.2.0" }

rust/core-lib/src/lib.rs

@@ -50,7 +50,6 @@ extern crate toml;
 extern crate xi_rope;
 extern crate xi_rpc;
 extern crate xi_trace;
-extern crate xi_trace_dump;
 extern crate xi_unicode;
 
 #[cfg(feature = "ledger")]

rust/core-lib/src/tabs.rs

@@ -864,16 +864,16 @@ impl CoreState {
     where
         P: AsRef<Path>,
     {
-        use xi_trace_dump::*;
+        use xi_trace::chrome_trace_dump;
         let mut all_traces = xi_trace::samples_cloned_unsorted();
-        if let Ok(mut traces) = chrome_trace::decode(frontend_samples) {
+        if let Ok(mut traces) = chrome_trace_dump::decode(frontend_samples) {
             all_traces.append(&mut traces);
         }
 
         for plugin in &self.running_plugins {
             match plugin.collect_trace() {
                 Ok(json) => {
-                    let mut trace = chrome_trace::decode(json).unwrap();
+                    let mut trace = chrome_trace_dump::decode(json).unwrap();
                     all_traces.append(&mut trace);
                 }
                 Err(e) => error!("trace error {:?}", e),
@@ -890,7 +890,7 @@ impl CoreState {
             }
         };
 
-        if let Err(e) = chrome_trace::serialize(&all_traces, &mut trace_file) {
+        if let Err(e) = chrome_trace_dump::serialize(&all_traces, &mut trace_file) {
             error!("error saving trace {:?}", e);
         }
     }

rust/plugin-lib/Cargo.toml

@@ -20,9 +20,6 @@ log = "0.4.3"
 [dependencies.xi-trace]
 path = "../trace"
 
-[dependencies.xi-trace-dump]
-path = "../trace-dump"
-
 [dependencies.xi-rpc]
 path = "../rpc"
 

rust/plugin-lib/src/dispatch.rs

@@ -175,10 +175,10 @@ impl<'a, P: 'a + Plugin> Dispatcher<'a, P> {
     }
 
     fn do_collect_trace(&self) -> Result<Value, RemoteError> {
-        use xi_trace_dump::*;
+        use xi_trace::chrome_trace_dump;
 
         let samples = xi_trace::samples_cloned_unsorted();
-        chrome_trace::to_value(&samples).map_err(|e| RemoteError::Custom {
+        chrome_trace_dump::to_value(&samples).map_err(|e| RemoteError::Custom {
             code: 0,
             message: format!("Could not serialize trace: {:?}", e),
             data: None,

rust/plugin-lib/src/lib.rs

@@ -17,7 +17,6 @@ extern crate xi_core_lib as xi_core;
 extern crate xi_rope;
 extern crate xi_rpc;
 extern crate xi_trace;
-extern crate xi_trace_dump;
 #[macro_use]
 extern crate serde_json;
 extern crate bytecount;

rust/trace/Cargo.toml

@@ -11,10 +11,12 @@ edition = '2018'
 [features]
 benchmarks = []
 collections_range = []
-default = []
+default = ["chrome_trace_event"]
 dict_payload = []
 json_payload = ["serde_json"]
 getpid = []
+chrome_trace_event = ["serde_json"]
+ipc = ["bincode"]
 
 [dependencies]
 time = "0.1"
@@ -24,3 +26,4 @@ serde_derive = "1.0"
 serde = "1.0"
 libc = "0.2"
 log = "0.4.3"
+bincode = { version = "1.0", optional = true }