Fixed compiler warnings.

Author: horned-sphere

api/swimos_form/src/structural/tests/mod.rs

@@ -204,36 +204,6 @@ impl<S: StructuralWritable, T: StructuralWritable> StructuralWritable for Genera
 
 pub struct HeaderView<T>(pub T);
 
-struct WithHeaderBody<T> {
-    header: T,
-    attr: T,
-    slot: T,
-}
-
-impl<T: StructuralWritable> StructuralWritable for WithHeaderBody<T> {
-    fn num_attributes(&self) -> usize {
-        2
-    }
-
-    fn write_with<W: StructuralWriter>(&self, writer: W) -> Result<W::Repr, W::Error> {
-        let mut rec_writer = writer.record(self.num_attributes())?;
-        rec_writer = rec_writer.write_attr(Cow::Borrowed("StructuralWritable"), &self.header)?;
-        rec_writer = rec_writer.write_attr(Cow::Borrowed("attr"), &self.attr)?;
-        let mut body_writer = rec_writer.complete_header(RecordBodyKind::MapLike, 1)?;
-        body_writer = body_writer.write_slot(&"slot", &self.slot)?;
-        body_writer.done()
-    }
-
-    fn write_into<W: StructuralWriter>(self, writer: W) -> Result<W::Repr, W::Error> {
-        let mut rec_writer = writer.record(self.num_attributes())?;
-        rec_writer = rec_writer.write_attr_into("StructuralWritable", self.header)?;
-        rec_writer = rec_writer.write_attr_into("attr", self.attr)?;
-        let mut body_writer = rec_writer.complete_header(RecordBodyKind::MapLike, 1)?;
-        body_writer = body_writer.write_slot_into("slot", self.slot)?;
-        body_writer.done()
-    }
-}
-
 struct WithHeaderField<T> {
     header: T,
     attr: T,

example_apps/console/Cargo.toml

@@ -20,6 +20,7 @@ console-views = { path = "console_views" }
 http = { workspace = true }
 rand = { workspace = true }
 duration-str = "0.5"
+thiserror = { workspace = true} 
 
 [target.'cfg(windows)'.dependencies]
 cursive = { version = "0.20", default-features = false, features = ["crossterm-backend"] }

example_apps/console/src/runtime/dummy_server.rs

@@ -14,7 +14,6 @@
 
 use std::{
     collections::{hash_map::Entry, BTreeMap, HashMap},
-    net::SocketAddr,
     pin::pin,
     sync::Arc,
     time::Duration,
@@ -36,6 +35,7 @@ use swimos_form::Form;
 use swimos_messages::warp::{peel_envelope_header_str, RawEnvelope};
 use swimos_recon::{parser::parse_value, printer::print_recon_compact};
 use swimos_utilities::trigger;
+use thiserror::Error;
 use tokio::{
     net::{TcpListener, TcpStream},
     sync::{
@@ -159,7 +159,7 @@ impl Clone for LaneSpec {
 }
 
 enum Event {
-    NewConnection(TcpStream, SocketAddr),
+    NewConnection(TcpStream),
     TaskDone(Result<(), TaskError>),
 }
 
@@ -190,7 +190,7 @@ impl DummyServer {
                 _ = &mut stop_rx => break,
                 result = listener.accept() => {
                     match result {
-                        Ok((stream, bound_to)) => Event::NewConnection(stream, bound_to),
+                        Ok((stream, _)) => Event::NewConnection(stream),
                         Err(err) => {
                             use std::io;
                             match err.kind() {
@@ -215,7 +215,7 @@ impl DummyServer {
                 }
             };
             match event {
-                Event::NewConnection(stream, _) => {
+                Event::NewConnection(stream) => {
                     let subprotocols = ProtocolRegistry::new(vec!["warp0"]).unwrap();
                     let upgrader = ratchet::accept_with(
                         stream,
@@ -245,12 +245,17 @@ impl DummyServer {
     }
 }
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 enum TaskError {
+    #[error("A web socket error occurred: {0}")]
     Ws(ratchet::Error),
+    #[error("Failed to accept an incoming connection: {0}")]
     AcceptErr(std::io::ErrorKind),
+    #[error("Received a binary web socket frame.")]
     BadMessageType,
+    #[error("Received a web socket frame containing invalid UTF-8.")]
     BadUtf8,
+    #[error("Received an invalid Warp envelope: {0}")]
     BadEnvelope(String),
 }
 

runtime/swimos_remote/src/task/mod.rs

@@ -177,12 +177,17 @@ enum OutgoingEvent {
     Response(BytesResponseMessage),
 }
 
-#[derive(Debug)]
+#[derive(Error, Debug)]
 enum InputError {
+    #[error("A web socket error occurred: {0}")]
     WsError(ratchet::Error),
+    #[error("A binary web socket frame was received.")]
     BinaryFrame,
+    #[error("A web socket frame contained invalid UTF-8: {0}")]
     BadUtf8(Utf8Error),
+    #[error("A web socket frame did not contain a valid Warp envelope: {0}")]
     InvalidEnvelope(MessageExtractError),
+    #[error("The web socket connection was closed.")]
     Closed(Option<CloseReason>),
 }
 

server/swimos_agent/src/agent_model/tests/run_handler.rs

@@ -26,21 +26,11 @@ use swimos_utilities::routing::route_uri::RouteUri;
 use crate::{
     agent_lifecycle::item_event::ItemEvent,
     agent_model::run_handler,
-    event_handler::{
-        ActionContext, HandlerAction, HandlerFuture, Modification, Spawner, StepResult,
-    },
+    event_handler::{ActionContext, HandlerAction, Modification, StepResult},
     meta::AgentMetadata,
     test_context::dummy_context,
 };
 
-struct NoSpawn;
-
-impl<Context> Spawner<Context> for NoSpawn {
-    fn spawn_suspend(&self, _: HandlerFuture<Context>) {
-        panic!("No suspended futures expected.");
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 enum Lane {
     A,

server/swimos_agent/src/event_handler/suspend/tests.rs

@@ -28,7 +28,7 @@ use swimos_api::agent::AgentConfig;
 use swimos_utilities::{routing::route_uri::RouteUri, trigger};
 use tokio::{sync::mpsc, time::Instant};
 
-use super::{HandlerFuture, Spawner, Suspend};
+use super::{HandlerFuture, Suspend};
 
 const CONFIG: AgentConfig = AgentConfig::DEFAULT;
 const NODE_URI: &str = "/node";
@@ -44,14 +44,6 @@ fn make_meta<'a>(
     AgentMetadata::new(uri, route_params, &CONFIG)
 }
 
-struct NoSpawn;
-
-impl<Context> Spawner<Context> for NoSpawn {
-    fn spawn_suspend(&self, _: HandlerFuture<Context>) {
-        panic!("No suspended futures expected.");
-    }
-}
-
 struct DummyAgent;
 
 #[tokio::test]

server/swimos_agent/src/event_handler/tests.rs

@@ -32,10 +32,7 @@ use crate::{
     test_context::dummy_context,
 };
 
-use super::{
-    join, ActionContext, Decode, HandlerAction, HandlerFuture, Modification, SideEffect, Spawner,
-    StepResult,
-};
+use super::{join, ActionContext, Decode, HandlerAction, Modification, SideEffect, StepResult};
 
 const CONFIG: AgentConfig = AgentConfig::DEFAULT;
 const NODE_URI: &str = "/node";
@@ -51,14 +48,6 @@ fn make_meta<'a>(
     AgentMetadata::new(uri, route_params, &CONFIG)
 }
 
-struct NoSpawn;
-
-impl<Context> Spawner<Context> for NoSpawn {
-    fn spawn_suspend(&self, _: HandlerFuture<Context>) {
-        panic!("No suspended futures expected.");
-    }
-}
-
 struct DummyAgent;
 
 const DUMMY: DummyAgent = DummyAgent;

server/swimos_agent/src/event_queue/mod.rs

@@ -116,10 +116,6 @@ where
         EventQueue::push(self, action)
     }
 
-    fn is_empty(&self) -> bool {
-        EventQueue::is_empty(self)
-    }
-
     type Output<'a> = StoreResponse<MapOperation<K, &'a V>>
     where
         Self: 'a,

server/swimos_agent/src/lanes/command/tests.rs

@@ -25,8 +25,8 @@ use tokio_util::codec::Decoder;
 use crate::{
     agent_model::WriteResult,
     event_handler::{
-        check_step::check_is_complete, EventHandlerError, HandlerAction, HandlerFuture,
-        ModificationFlags, Spawner, StepResult,
+        check_step::check_is_complete, EventHandlerError, HandlerAction, ModificationFlags,
+        StepResult,
     },
     lanes::{command::DoCommand, LaneItem},
     meta::AgentMetadata,
@@ -37,14 +37,6 @@ use super::CommandLane;
 
 const LANE_ID: u64 = 38;
 
-struct NoSpawn;
-
-impl<Context> Spawner<Context> for NoSpawn {
-    fn spawn_suspend(&self, _: HandlerFuture<Context>) {
-        panic!("No suspended futures expected.");
-    }
-}
-
 #[test]
 fn send_command() {
     let lane = CommandLane::<i32>::new(LANE_ID);

server/swimos_agent/src/lanes/map/tests.rs

@@ -31,9 +31,7 @@ use uuid::Uuid;
 
 use crate::{
     agent_model::WriteResult,
-    event_handler::{
-        EventHandlerError, HandlerAction, HandlerFuture, Modification, Spawner, StepResult,
-    },
+    event_handler::{EventHandlerError, HandlerAction, Modification, StepResult},
     item::MapItem,
     lanes::{
         map::{
@@ -65,14 +63,6 @@ fn init() -> HashMap<i32, Text> {
         .collect()
 }
 
-struct NoSpawn;
-
-impl<Context> Spawner<Context> for NoSpawn {
-    fn spawn_suspend(&self, _: HandlerFuture<Context>) {
-        panic!("No suspended futures expected.");
-    }
-}
-
 #[test]
 fn get_from_map_lane() {
     let lane = MapLane::new(ID, init());