From ebd655549f4bf761a7e9571d7bcc377220b512e2 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 2 Nov 2022 13:25:16 +0100
Subject: [PATCH] Move `StatusReport` to `fj-viewer`

Since more code has been moved out of the main loop into separate
threads, and communication has been replaced with channels,
`StatusReport` isn't as widely used anymore.
---
 Cargo.lock                                            | 2 +-
 crates/fj-interop/Cargo.toml                          | 1 -
 crates/fj-interop/src/lib.rs                          | 1 -
 crates/fj-viewer/Cargo.toml                           | 1 +
 crates/fj-viewer/src/gui.rs                           | 3 +--
 crates/fj-viewer/src/lib.rs                           | 2 ++
 crates/{fj-interop => fj-viewer}/src/status_report.rs | 0
 crates/fj-viewer/src/viewer.rs                        | 5 ++---
 crates/fj-window/src/run.rs                           | 3 +--
 9 files changed, 8 insertions(+), 10 deletions(-)
 rename crates/{fj-interop => fj-viewer}/src/status_report.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 97dab07e7..ded72f909 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1177,7 +1177,6 @@ dependencies = [
 name = "fj-interop"
 version = "0.22.0"
 dependencies = [
- "chrono",
  "fj-math",
 ]
 
@@ -1236,6 +1235,7 @@ name = "fj-viewer"
 version = "0.22.0"
 dependencies = [
  "bytemuck",
+ "chrono",
  "crossbeam-channel",
  "egui",
  "egui-wgpu",
diff --git a/crates/fj-interop/Cargo.toml b/crates/fj-interop/Cargo.toml
index cf6bf44e5..e40226a36 100644
--- a/crates/fj-interop/Cargo.toml
+++ b/crates/fj-interop/Cargo.toml
@@ -11,5 +11,4 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-chrono = "0.4.22"
 fj-math.workspace = true
diff --git a/crates/fj-interop/src/lib.rs b/crates/fj-interop/src/lib.rs
index 450190fe1..cea11ceb3 100644
--- a/crates/fj-interop/src/lib.rs
+++ b/crates/fj-interop/src/lib.rs
@@ -18,4 +18,3 @@ pub mod debug;
 pub mod ext;
 pub mod mesh;
 pub mod processed_shape;
-pub mod status_report;
diff --git a/crates/fj-viewer/Cargo.toml b/crates/fj-viewer/Cargo.toml
index 3ec99213f..8fca4af35 100644
--- a/crates/fj-viewer/Cargo.toml
+++ b/crates/fj-viewer/Cargo.toml
@@ -12,6 +12,7 @@ categories.workspace = true
 
 [dependencies]
 bytemuck = "1.12.2"
+chrono = "0.4.22"
 crossbeam-channel = "0.5.6"
 egui = "0.19.0"
 egui-wgpu = "0.19.0"
diff --git a/crates/fj-viewer/src/gui.rs b/crates/fj-viewer/src/gui.rs
index 6c1fad6d3..1a5e5da5d 100644
--- a/crates/fj-viewer/src/gui.rs
+++ b/crates/fj-viewer/src/gui.rs
@@ -24,10 +24,9 @@ use crossbeam_channel::{Receiver, Sender};
 #[cfg(not(target_arch = "wasm32"))]
 use rfd::FileDialog;
 
-use fj_interop::status_report::StatusReport;
 use fj_math::{Aabb, Scalar};
 
-use crate::graphics::DrawConfig;
+use crate::{graphics::DrawConfig, StatusReport};
 
 struct GuiState {
     has_model: bool,
diff --git a/crates/fj-viewer/src/lib.rs b/crates/fj-viewer/src/lib.rs
index eea0499fb..b30df8506 100644
--- a/crates/fj-viewer/src/lib.rs
+++ b/crates/fj-viewer/src/lib.rs
@@ -19,6 +19,7 @@ mod graphics;
 mod gui;
 mod input;
 mod screen;
+mod status_report;
 mod viewer;
 
 pub use self::{
@@ -27,5 +28,6 @@ pub use self::{
     gui::Gui,
     input::{InputEvent, InputHandler},
     screen::{NormalizedScreenPosition, Screen, ScreenSize},
+    status_report::StatusReport,
     viewer::Viewer,
 };
diff --git a/crates/fj-interop/src/status_report.rs b/crates/fj-viewer/src/status_report.rs
similarity index 100%
rename from crates/fj-interop/src/status_report.rs
rename to crates/fj-viewer/src/status_report.rs
diff --git a/crates/fj-viewer/src/viewer.rs b/crates/fj-viewer/src/viewer.rs
index c0520084f..803541608 100644
--- a/crates/fj-viewer/src/viewer.rs
+++ b/crates/fj-viewer/src/viewer.rs
@@ -1,8 +1,6 @@
 use std::path::PathBuf;
 
-use fj_interop::{
-    processed_shape::ProcessedShape, status_report::StatusReport,
-};
+use fj_interop::processed_shape::ProcessedShape;
 use fj_math::Aabb;
 use tracing::warn;
 
@@ -11,6 +9,7 @@ use crossbeam_channel::{Receiver, Sender};
 use crate::{
     camera::FocusPoint, gui::Gui, Camera, DrawConfig, InputEvent, InputHandler,
     NormalizedScreenPosition, Renderer, RendererInitError, Screen, ScreenSize,
+    StatusReport,
 };
 
 /// The Fornjot model viewer
diff --git a/crates/fj-window/src/run.rs b/crates/fj-window/src/run.rs
index 4bc91f38b..91776f10b 100644
--- a/crates/fj-window/src/run.rs
+++ b/crates/fj-window/src/run.rs
@@ -6,11 +6,10 @@
 use std::{error, path::PathBuf};
 
 use fj_host::{Host, Model, ModelEvent, Parameters};
-use fj_interop::status_report::StatusReport;
 use fj_operations::shape_processor::ShapeProcessor;
 use fj_viewer::{
     InputEvent, NormalizedScreenPosition, RendererInitError, Screen,
-    ScreenSize, Viewer,
+    ScreenSize, StatusReport, Viewer,
 };
 use futures::executor::block_on;
 use tracing::trace;