Pull it together.

j7s_diagnostics_cxx/Cargo.lock

@@ -16,9 +16,9 @@ checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "cc"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
+checksum = "5add81bb678e6cb321aff7fa0dc7689ad82b112dbc032cea19f91d6b8e3582b9"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -160,7 +160,6 @@ dependencies = [
 [[package]]
 name = "j7s_diagnostics"
 version = "0.1.0"
-source = "git+https://git.jpace121.net/public/j7s_diagnostics.git?branch=main#5f5e9c3b8aa82fd6d14f7a7931604a225fd6b551"
 dependencies = [
  "limbo_graph",
  "thiserror",

j7s_diagnostics_cxx/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["staticlib"]
 [dependencies]
 anyhow = "1.0.103"
 cxx = "1.0"
-j7s_diagnostics = { branch = "main", git="https://git.jpace121.net/public/j7s_diagnostics.git" }
+j7s_diagnostics = { path="../../j7s_diagnostics/" }
 
 [build-dependencies]
 cxx-build = "1.0"

j7s_diagnostics_cxx/src/lib.rs

@@ -50,6 +50,7 @@ mod ffi {
         #[Self = "DiagnosticTree"]
         fn build() -> Box<DiagnosticTree>;
         fn add_statuses(self: &mut DiagnosticTree, statuses: &Vec<DiagnosticStatus>) -> Result<()>;
+        fn add_status(self: &mut DiagnosticTree, status: &DiagnosticStatus) -> Result<()>;
         fn reconcile(self: &mut DiagnosticTree) -> Result<()>;
         fn aggregate(self: &DiagnosticTree) -> Result<Vec<DiagnosticStatus>>;
 
@@ -138,6 +139,10 @@ impl DiagnosticTree {
         Ok(self.graph.add_status_vec(&converted_statuses)?)
     }
 
+    fn add_status(self: &mut DiagnosticTree, status: &crate::ffi::DiagnosticStatus) -> anyhow::Result<()> {
+        Ok(self.graph.add_status(diagnostic_status_to_rust(&status))?)
+    }
+
     pub fn reconcile(self: &mut DiagnosticTree) -> anyhow::Result<()> {
         Ok(self.graph.reconcile_levels()?)
     }