From fb8b6e166c8096e1ad9b12ff57bfca355468252a Mon Sep 17 00:00:00 2001
From: Leon Vack <dev@lgcl.de>
Date: Tue, 16 Apr 2024 20:58:13 +0200
Subject: [PATCH] Clean up some stuff and move the config for wlcs tests

---
 Cargo.toml                                                     | 2 +-
 wlcs_pinnacle/{wlcs_pinnacle_config => config}/Cargo.lock      | 0
 wlcs_pinnacle/{wlcs_pinnacle_config => config}/Cargo.toml      | 0
 wlcs_pinnacle/{wlcs_pinnacle_config => config}/metaconfig.toml | 0
 wlcs_pinnacle/{wlcs_pinnacle_config => config}/pinnacle-config | 0
 wlcs_pinnacle/{wlcs_pinnacle_config => config}/src/main.rs     | 0
 wlcs_pinnacle/src/lib.rs                                       | 2 +-
 wlcs_pinnacle/src/main_loop.rs                                 | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename wlcs_pinnacle/{wlcs_pinnacle_config => config}/Cargo.lock (100%)
 rename wlcs_pinnacle/{wlcs_pinnacle_config => config}/Cargo.toml (100%)
 rename wlcs_pinnacle/{wlcs_pinnacle_config => config}/metaconfig.toml (100%)
 rename wlcs_pinnacle/{wlcs_pinnacle_config => config}/pinnacle-config (100%)
 rename wlcs_pinnacle/{wlcs_pinnacle_config => config}/src/main.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index cc19785..5c74d85 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ members = [
     "api/rust",
     "api/rust/pinnacle-api-macros",
     "wlcs_pinnacle",
-    "wlcs_pinnacle/wlcs_pinnacle_config",
+    "wlcs_pinnacle/config",
 ]
 
 [workspace.package]
diff --git a/wlcs_pinnacle/wlcs_pinnacle_config/Cargo.lock b/wlcs_pinnacle/config/Cargo.lock
similarity index 100%
rename from wlcs_pinnacle/wlcs_pinnacle_config/Cargo.lock
rename to wlcs_pinnacle/config/Cargo.lock
diff --git a/wlcs_pinnacle/wlcs_pinnacle_config/Cargo.toml b/wlcs_pinnacle/config/Cargo.toml
similarity index 100%
rename from wlcs_pinnacle/wlcs_pinnacle_config/Cargo.toml
rename to wlcs_pinnacle/config/Cargo.toml
diff --git a/wlcs_pinnacle/wlcs_pinnacle_config/metaconfig.toml b/wlcs_pinnacle/config/metaconfig.toml
similarity index 100%
rename from wlcs_pinnacle/wlcs_pinnacle_config/metaconfig.toml
rename to wlcs_pinnacle/config/metaconfig.toml
diff --git a/wlcs_pinnacle/wlcs_pinnacle_config/pinnacle-config b/wlcs_pinnacle/config/pinnacle-config
similarity index 100%
rename from wlcs_pinnacle/wlcs_pinnacle_config/pinnacle-config
rename to wlcs_pinnacle/config/pinnacle-config
diff --git a/wlcs_pinnacle/wlcs_pinnacle_config/src/main.rs b/wlcs_pinnacle/config/src/main.rs
similarity index 100%
rename from wlcs_pinnacle/wlcs_pinnacle_config/src/main.rs
rename to wlcs_pinnacle/config/src/main.rs
diff --git a/wlcs_pinnacle/src/lib.rs b/wlcs_pinnacle/src/lib.rs
index 2ffbfe8..a4cb482 100644
--- a/wlcs_pinnacle/src/lib.rs
+++ b/wlcs_pinnacle/src/lib.rs
@@ -138,7 +138,7 @@ impl Wlcs for PinnacleHandle {
     fn stop(&mut self) {
         if let Some(conn) = self.server_conn.take() {
             let _ = conn.sender.send(WlcsEvent::Stop);
-            conn.join.join().expect("failed to join");
+            let _ = conn.join.join();
         }
     }
 
diff --git a/wlcs_pinnacle/src/main_loop.rs b/wlcs_pinnacle/src/main_loop.rs
index eb1f98f..02a5b90 100644
--- a/wlcs_pinnacle/src/main_loop.rs
+++ b/wlcs_pinnacle/src/main_loop.rs
@@ -1,4 +1,4 @@
-use std::{sync::Arc, thread, time::Duration};
+use std::{sync::Arc, time::Duration};
 
 use pinnacle::{
     backend::dummy::setup_dummy,