Performed a partial compile cleanup.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Has been cancelled

This commit is contained in:
2026-04-23 11:31:52 -04:00
parent 88cd6cd606
commit 160de994bb
14 changed files with 34 additions and 31 deletions

View File

@@ -1,8 +1,5 @@
use super::{Field, FieldType}; use super::{Field, FieldType};
use crate::{ use crate::mtterror::{ErrorID, MTTError};
mtterror::{ErrorID, MTTError},
name::NameType,
};
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use std::time::Duration; use std::time::Duration;
use uuid::Uuid; use uuid::Uuid;

View File

@@ -1,4 +1,4 @@
use super::{Addition, Delete, DocDef, FieldType, Query, Update}; use super::{Addition, Delete, Query, Update};
use crate::{message::MessageAction, name::NameType}; use crate::{message::MessageAction, name::NameType};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]

View File

@@ -1,4 +1,4 @@
use super::{CalcValue, RequestData}; use super::RequestData;
use crate::{message::MessageAction, name::NameType}; use crate::{message::MessageAction, name::NameType};
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@@ -40,7 +40,10 @@ impl MessageAction for Reply {
#[cfg(test)] #[cfg(test)]
mod replies { mod replies {
use super::*; use super::*;
use crate::{action::Field, name::Name}; use crate::{
action::{CalcValue, Field},
name::Name,
};
use uuid::Uuid; use uuid::Uuid;
#[test] #[test]

View File

@@ -1,7 +1,4 @@
use crate::{ use crate::{action::CalcValue, name::NameType};
action::{CalcValue, Field},
name::NameType,
};
use std::collections::HashMap; use std::collections::HashMap;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@@ -42,7 +39,7 @@ impl RequestData {
#[cfg(test)] #[cfg(test)]
mod request_datum { mod request_datum {
use super::*; use super::*;
use crate::name::Name; use crate::{name::Name, Field};
use uuid::Uuid; use uuid::Uuid;
#[test] #[test]

View File

@@ -1,7 +1,7 @@
use crate::{ use crate::{
action::{Action, MsgAction, Records}, action::{Action, MsgAction, Records},
message::Message, message::Message,
name::{Name, NameType, Names}, name::{Name, Names},
queue::{ queue::{
data_director::{Include, Path, RegMsg, Register}, data_director::{Include, Path, RegMsg, Register},
router::Queue, router::Queue,

View File

@@ -19,7 +19,6 @@ use std::{
sync::mpsc::{channel, Receiver}, sync::mpsc::{channel, Receiver},
thread::spawn, thread::spawn,
}; };
use uuid::Uuid;
pub struct CreateDoc { pub struct CreateDoc {
queue: Queue, queue: Queue,
@@ -225,6 +224,7 @@ impl Indexes {
mod indexes { mod indexes {
use super::*; use super::*;
use crate::action::{FieldType, Operand}; use crate::action::{FieldType, Operand};
use uuid::Uuid;
fn get_fields(count: usize) -> Vec<Field> { fn get_fields(count: usize) -> Vec<Field> {
let mut output = Vec::new(); let mut output = Vec::new();

View File

@@ -8,7 +8,6 @@ use crate::{
queue::data_director::{Include, Path}, queue::data_director::{Include, Path},
}; };
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use uuid::Uuid;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
struct FieldSetting { struct FieldSetting {
@@ -82,6 +81,7 @@ mod fieldsettings {
use crate::{action::Calculation, Operand}; use crate::{action::Calculation, Operand};
use chrono::Utc; use chrono::Utc;
use std::time::Duration; use std::time::Duration;
use uuid::Uuid;
#[test] #[test]
fn can_field_type_be_retrieved() { fn can_field_type_be_retrieved() {
@@ -428,7 +428,8 @@ impl MessageAction for DocDef {}
#[cfg(test)] #[cfg(test)]
mod docdefs { mod docdefs {
use super::*; use super::*;
use crate::action::{Query, Update}; use crate::action::Update;
use uuid::Uuid;
#[test] #[test]
fn can_create_document_definition() { fn can_create_document_definition() {

View File

@@ -5,7 +5,6 @@ use std::{
cmp::Ordering, cmp::Ordering,
collections::HashMap, collections::HashMap,
ops::{Add, AddAssign}, ops::{Add, AddAssign},
str::Split,
time::Duration, time::Duration,
}; };
use uuid::Uuid; use uuid::Uuid;

View File

@@ -1,12 +1,12 @@
use crate::{ use crate::{
action::{Action, CalcValue, Calculation, Delete, FieldType, Operand, Query, Update}, action::{Action, CalcValue, Calculation, Delete, FieldType, Operand, Update},
document::{ document::{
clock::Clock, clock::Clock,
create::IndexType, create::IndexType,
definition::{DocDef, DocFuncType}, definition::{DocDef, DocFuncType},
}, },
message::{Message, MessageID}, message::{Message, MessageID},
name::{Name, NameType}, name::Name,
queue::{ queue::{
data_director::{Include, Path, RegMsg, Register}, data_director::{Include, Path, RegMsg, Register},
router::Queue, router::Queue,

View File

@@ -14,7 +14,7 @@ use queue::{
SenderID, SenderID,
}; };
use std::{ use std::{
sync::mpsc::{channel, Receiver, RecvTimeoutError, Sender}, sync::mpsc::{channel, Receiver, RecvTimeoutError},
time::Duration, time::Duration,
}; };
use uuid::Uuid; use uuid::Uuid;
@@ -76,11 +76,11 @@ impl MTTClient {
for path in paths.iter().cloned() { for path in paths.iter().cloned() {
let reg_msg = Register::new(sender_id.clone(), RegMsg::AddRoute(path)); let reg_msg = Register::new(sender_id.clone(), RegMsg::AddRoute(path));
queue.send(msg.set_action(reg_msg)); queue.send(msg.set_action(reg_msg));
let result = rx.recv().unwrap(); rx.recv().unwrap();
} }
match sess_id { match sess_id {
Some(id) => { Some(id) => {
let sess_id = match Uuid::try_from(id.as_str()) { match Uuid::try_from(id.as_str()) {
Ok(data) => { Ok(data) => {
let mut qry = Query::new(Session::doc_names()[0].clone()); let mut qry = Query::new(Session::doc_names()[0].clone());
let mut calc = Calculation::new(Operand::Equal); let mut calc = Calculation::new(Operand::Equal);
@@ -243,7 +243,7 @@ impl MoreThanText {
MTTClient::new(self.queue.clone(), Some(id), lang) MTTClient::new(self.queue.clone(), Some(id), lang)
} }
pub fn get_document(&self, name: &str, id: &str) -> Result<String, MTTError> { pub fn get_document(&self, name: &str, _id: &str) -> Result<String, MTTError> {
if name == "page" { if name == "page" {
Ok("something".to_string()) Ok("something".to_string())
} else { } else {
@@ -260,7 +260,7 @@ pub struct TestMoreThanText {
impl TestMoreThanText { impl TestMoreThanText {
pub fn new() -> Self { pub fn new() -> Self {
let mut mtt = MoreThanText::new(); let mtt = MoreThanText::new();
let queue = mtt.queue.clone(); let queue = mtt.queue.clone();
Self { Self {
mtt: mtt, mtt: mtt,

View File

@@ -1,5 +1,5 @@
use crate::{ use crate::{
action::{Field, FieldType, MsgAction}, action::{Field, MsgAction},
name::NameType, name::NameType,
queue::data_director::{Include, Path, Route}, queue::data_director::{Include, Path, Route},
}; };
@@ -130,7 +130,7 @@ impl MessageAction for Message {
mod messages { mod messages {
use super::*; use super::*;
use crate::{ use crate::{
action::{DocDef, Query, Reply}, action::{DocDef, FieldType, Query, Reply},
name::{name_id_support::test_name_id, Name}, name::{name_id_support::test_name_id, Name},
ErrorID, MTTError, ErrorID, MTTError,
}; };

View File

@@ -4,9 +4,7 @@ use crate::{
name::{Name, NameType}, name::{Name, NameType},
MissingTranslation, MissingTranslation,
}; };
use isolang::Language;
use std::{collections::VecDeque, error::Error, fmt}; use std::{collections::VecDeque, error::Error, fmt};
use uuid::Uuid;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum ErrorID { pub enum ErrorID {

View File

@@ -495,6 +495,12 @@ impl SessionEntry {
} }
} }
impl SessionEntry {
fn new(id: Field) -> Self {
Self { id: id }
}
}
#[cfg(test)] #[cfg(test)]
mod session_entries { mod session_entries {
use super::*; use super::*;
@@ -502,9 +508,12 @@ mod session_entries {
#[test] #[test]
fn does_entry_return_id() { fn does_entry_return_id() {
let id: Field = Uuid::new_v4().into(); let id: Field = Uuid::new_v4().into();
let entry = SessionEntry { id: id.clone() }; let entry = SessionEntry::new(id.clone());
assert_eq!(entry.id(), &id); assert_eq!(entry.id(), &id);
} }
#[test]
fn can_determine_if_entry_expired() {}
} }
struct Session { struct Session {

View File

@@ -1,6 +1,5 @@
use crate::{ use crate::{
message::Message, message::Message,
name::NameType,
queue::data_director::{DocRegistry, RegMsg, Register}, queue::data_director::{DocRegistry, RegMsg, Register},
}; };
use std::{ use std::{
@@ -276,7 +275,7 @@ mod queues {
use super::*; use super::*;
use crate::{ use crate::{
action::MsgAction, action::MsgAction,
mtterror::{ErrorID, MTTError}, mtterror::ErrorID,
name::Name, name::Name,
queue::data_director::{Include, Path}, queue::data_director::{Include, Path},
support_tests::TIMEOUT, support_tests::TIMEOUT,