From 160de994bb7574651a63d157f558531069ef2b14 Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Thu, 23 Apr 2026 11:31:52 -0400 Subject: [PATCH] Performed a partial compile cleanup. --- src/action/calculation.rs | 5 +---- src/action/client.rs | 2 +- src/action/reply.rs | 7 +++++-- src/action/request_data.rs | 7 ++----- src/document/clock.rs | 2 +- src/document/create.rs | 2 +- src/document/definition.rs | 5 +++-- src/document/field.rs | 1 - src/document/session.rs | 4 ++-- src/lib.rs | 10 +++++----- src/message.rs | 4 ++-- src/mtterror.rs | 2 -- src/queue/data_director.rs | 11 ++++++++++- src/queue/router.rs | 3 +-- 14 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/action/calculation.rs b/src/action/calculation.rs index 9e1ac14..5b43e42 100644 --- a/src/action/calculation.rs +++ b/src/action/calculation.rs @@ -1,8 +1,5 @@ use super::{Field, FieldType}; -use crate::{ - mtterror::{ErrorID, MTTError}, - name::NameType, -}; +use crate::mtterror::{ErrorID, MTTError}; use chrono::{DateTime, Utc}; use std::time::Duration; use uuid::Uuid; diff --git a/src/action/client.rs b/src/action/client.rs index 8dc8ada..ee565d6 100644 --- a/src/action/client.rs +++ b/src/action/client.rs @@ -1,4 +1,4 @@ -use super::{Addition, Delete, DocDef, FieldType, Query, Update}; +use super::{Addition, Delete, Query, Update}; use crate::{message::MessageAction, name::NameType}; #[derive(Clone, Debug)] diff --git a/src/action/reply.rs b/src/action/reply.rs index 5505f52..be15f12 100644 --- a/src/action/reply.rs +++ b/src/action/reply.rs @@ -1,4 +1,4 @@ -use super::{CalcValue, RequestData}; +use super::RequestData; use crate::{message::MessageAction, name::NameType}; #[derive(Clone, Debug)] @@ -40,7 +40,10 @@ impl MessageAction for Reply { #[cfg(test)] mod replies { use super::*; - use crate::{action::Field, name::Name}; + use crate::{ + action::{CalcValue, Field}, + name::Name, + }; use uuid::Uuid; #[test] diff --git a/src/action/request_data.rs b/src/action/request_data.rs index 0f0102a..fc1a8ad 100644 --- a/src/action/request_data.rs +++ b/src/action/request_data.rs @@ -1,7 +1,4 @@ -use crate::{ - action::{CalcValue, Field}, - name::NameType, -}; +use crate::{action::CalcValue, name::NameType}; use std::collections::HashMap; #[derive(Clone, Debug)] @@ -42,7 +39,7 @@ impl RequestData { #[cfg(test)] mod request_datum { use super::*; - use crate::name::Name; + use crate::{name::Name, Field}; use uuid::Uuid; #[test] diff --git a/src/document/clock.rs b/src/document/clock.rs index a132dd3..6de5e07 100644 --- a/src/document/clock.rs +++ b/src/document/clock.rs @@ -1,7 +1,7 @@ use crate::{ action::{Action, MsgAction, Records}, message::Message, - name::{Name, NameType, Names}, + name::{Name, Names}, queue::{ data_director::{Include, Path, RegMsg, Register}, router::Queue, diff --git a/src/document/create.rs b/src/document/create.rs index f087fc5..fab7a92 100644 --- a/src/document/create.rs +++ b/src/document/create.rs @@ -19,7 +19,6 @@ use std::{ sync::mpsc::{channel, Receiver}, thread::spawn, }; -use uuid::Uuid; pub struct CreateDoc { queue: Queue, @@ -225,6 +224,7 @@ impl Indexes { mod indexes { use super::*; use crate::action::{FieldType, Operand}; + use uuid::Uuid; fn get_fields(count: usize) -> Vec { let mut output = Vec::new(); diff --git a/src/document/definition.rs b/src/document/definition.rs index 0137add..8219468 100644 --- a/src/document/definition.rs +++ b/src/document/definition.rs @@ -8,7 +8,6 @@ use crate::{ queue::data_director::{Include, Path}, }; use std::collections::{HashMap, HashSet}; -use uuid::Uuid; #[derive(Clone, Debug)] struct FieldSetting { @@ -82,6 +81,7 @@ mod fieldsettings { use crate::{action::Calculation, Operand}; use chrono::Utc; use std::time::Duration; + use uuid::Uuid; #[test] fn can_field_type_be_retrieved() { @@ -428,7 +428,8 @@ impl MessageAction for DocDef {} #[cfg(test)] mod docdefs { use super::*; - use crate::action::{Query, Update}; + use crate::action::Update; + use uuid::Uuid; #[test] fn can_create_document_definition() { diff --git a/src/document/field.rs b/src/document/field.rs index de3fbfe..c973568 100644 --- a/src/document/field.rs +++ b/src/document/field.rs @@ -5,7 +5,6 @@ use std::{ cmp::Ordering, collections::HashMap, ops::{Add, AddAssign}, - str::Split, time::Duration, }; use uuid::Uuid; diff --git a/src/document/session.rs b/src/document/session.rs index a67f68c..c3c451c 100644 --- a/src/document/session.rs +++ b/src/document/session.rs @@ -1,12 +1,12 @@ use crate::{ - action::{Action, CalcValue, Calculation, Delete, FieldType, Operand, Query, Update}, + action::{Action, CalcValue, Calculation, Delete, FieldType, Operand, Update}, document::{ clock::Clock, create::IndexType, definition::{DocDef, DocFuncType}, }, message::{Message, MessageID}, - name::{Name, NameType}, + name::Name, queue::{ data_director::{Include, Path, RegMsg, Register}, router::Queue, diff --git a/src/lib.rs b/src/lib.rs index b85bccf..c734d85 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ use queue::{ SenderID, }; use std::{ - sync::mpsc::{channel, Receiver, RecvTimeoutError, Sender}, + sync::mpsc::{channel, Receiver, RecvTimeoutError}, time::Duration, }; use uuid::Uuid; @@ -76,11 +76,11 @@ impl MTTClient { for path in paths.iter().cloned() { let reg_msg = Register::new(sender_id.clone(), RegMsg::AddRoute(path)); queue.send(msg.set_action(reg_msg)); - let result = rx.recv().unwrap(); + rx.recv().unwrap(); } match sess_id { Some(id) => { - let sess_id = match Uuid::try_from(id.as_str()) { + match Uuid::try_from(id.as_str()) { Ok(data) => { let mut qry = Query::new(Session::doc_names()[0].clone()); let mut calc = Calculation::new(Operand::Equal); @@ -243,7 +243,7 @@ impl MoreThanText { MTTClient::new(self.queue.clone(), Some(id), lang) } - pub fn get_document(&self, name: &str, id: &str) -> Result { + pub fn get_document(&self, name: &str, _id: &str) -> Result { if name == "page" { Ok("something".to_string()) } else { @@ -260,7 +260,7 @@ pub struct TestMoreThanText { impl TestMoreThanText { pub fn new() -> Self { - let mut mtt = MoreThanText::new(); + let mtt = MoreThanText::new(); let queue = mtt.queue.clone(); Self { mtt: mtt, diff --git a/src/message.rs b/src/message.rs index a0ec2e0..3cfd3fc 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,5 +1,5 @@ use crate::{ - action::{Field, FieldType, MsgAction}, + action::{Field, MsgAction}, name::NameType, queue::data_director::{Include, Path, Route}, }; @@ -130,7 +130,7 @@ impl MessageAction for Message { mod messages { use super::*; use crate::{ - action::{DocDef, Query, Reply}, + action::{DocDef, FieldType, Query, Reply}, name::{name_id_support::test_name_id, Name}, ErrorID, MTTError, }; diff --git a/src/mtterror.rs b/src/mtterror.rs index 01a9402..273f043 100644 --- a/src/mtterror.rs +++ b/src/mtterror.rs @@ -4,9 +4,7 @@ use crate::{ name::{Name, NameType}, MissingTranslation, }; -use isolang::Language; use std::{collections::VecDeque, error::Error, fmt}; -use uuid::Uuid; #[derive(Clone, Debug)] pub enum ErrorID { diff --git a/src/queue/data_director.rs b/src/queue/data_director.rs index 8757c95..3b7e23f 100644 --- a/src/queue/data_director.rs +++ b/src/queue/data_director.rs @@ -495,6 +495,12 @@ impl SessionEntry { } } +impl SessionEntry { + fn new(id: Field) -> Self { + Self { id: id } + } +} + #[cfg(test)] mod session_entries { use super::*; @@ -502,9 +508,12 @@ mod session_entries { #[test] fn does_entry_return_id() { let id: Field = Uuid::new_v4().into(); - let entry = SessionEntry { id: id.clone() }; + let entry = SessionEntry::new(id.clone()); assert_eq!(entry.id(), &id); } + + #[test] + fn can_determine_if_entry_expired() {} } struct Session { diff --git a/src/queue/router.rs b/src/queue/router.rs index f3b1a8a..5aa928e 100644 --- a/src/queue/router.rs +++ b/src/queue/router.rs @@ -1,6 +1,5 @@ use crate::{ message::Message, - name::NameType, queue::data_director::{DocRegistry, RegMsg, Register}, }; use std::{ @@ -276,7 +275,7 @@ mod queues { use super::*; use crate::{ action::MsgAction, - mtterror::{ErrorID, MTTError}, + mtterror::ErrorID, name::Name, queue::data_director::{Include, Path}, support_tests::TIMEOUT,