diff --git a/module/core/mod_interface_meta/src/record.rs b/module/core/mod_interface_meta/src/record.rs index 158d5f7fe7..8c6a76d57a 100644 --- a/module/core/mod_interface_meta/src/record.rs +++ b/module/core/mod_interface_meta/src/record.rs @@ -2,7 +2,6 @@ pub( crate ) mod private { use crate::*; - use derive_tools::IsVariant; use macro_tools::exposed::*; /// @@ -18,7 +17,7 @@ pub( crate ) mod private /// Kind of element. /// - #[ derive( IsVariant, Debug, PartialEq, Eq, Clone, Copy ) ] + #[ derive( Debug, PartialEq, Eq, Clone, Copy ) ] pub enum ElementType { MicroModule( syn::token::Mod ), diff --git a/module/move/unitore/src/action/config.rs b/module/move/unitore/src/action/config.rs index eef632b981..9dfc356fe0 100644 --- a/module/move/unitore/src/action/config.rs +++ b/module/move/unitore/src/action/config.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use crate::*; -use error_tools::{ untyped::Context, Result }; +use error_tools::{ untyped::Context, untyped::Result }; use sled_adapter::FeedStorage; use entity:: { diff --git a/module/move/unitore/src/action/feed.rs b/module/move/unitore/src/action/feed.rs index 70063de854..6ef23cc1ab 100644 --- a/module/move/unitore/src/action/feed.rs +++ b/module/move/unitore/src/action/feed.rs @@ -4,7 +4,7 @@ use crate::*; use action::{ Report, frame::SelectedEntries }; use sled_adapter::FeedStorage; use entity::feed::FeedStore; -use error_tools::Result; +use error_tools::untyped::Result; /// List all feeds from storage. pub async fn feeds_list( mut storage : FeedStorage< gluesql::sled_storage::SledStorage > ) -> Result< impl Report > diff --git a/module/move/unitore/src/action/frame.rs b/module/move/unitore/src/action/frame.rs index 2acb4cd168..fc23b10683 100644 --- a/module/move/unitore/src/action/frame.rs +++ b/module/move/unitore/src/action/frame.rs @@ -10,7 +10,7 @@ use entity:: }; use gluesql::prelude::{ Payload, Value, SledStorage }; use feed_config; -use error_tools::{ err, Result }; +use error_tools::{ err, untyped::Result }; use action::Report; // qqq : review the whole project and make sure all names are consitant: actions, commands, its tests diff --git a/module/move/unitore/src/action/query.rs b/module/move/unitore/src/action/query.rs index d9f4180384..f3de3beefe 100644 --- a/module/move/unitore/src/action/query.rs +++ b/module/move/unitore/src/action/query.rs @@ -6,7 +6,7 @@ use crate::*; use gluesql::core::executor::Payload; use sled_adapter::Store; use action::Report; -use error_tools::Result; +use error_tools::untyped::Result; /// Execute query specified in query string. pub async fn query_execute diff --git a/module/move/unitore/src/action/table.rs b/module/move/unitore/src/action/table.rs index ce9a4e756f..03a4b0da06 100644 --- a/module/move/unitore/src/action/table.rs +++ b/module/move/unitore/src/action/table.rs @@ -6,7 +6,7 @@ use std::collections::HashMap; use action::Report; use sled_adapter::FeedStorage; use entity::table::TableStore; -use error_tools::Result; +use error_tools::untyped::Result; /// Get labels of column for specified table. pub async fn table_list diff --git a/module/move/unitore/src/command/config.rs b/module/move/unitore/src/command/config.rs index 72eb063007..bbd436ccb9 100644 --- a/module/move/unitore/src/command/config.rs +++ b/module/move/unitore/src/command/config.rs @@ -7,7 +7,7 @@ use gluesql::sled_storage::sled::Config; use wca::{ Command, Type, VerifiedCommand }; use sled_adapter::FeedStorage; use action::{ Report, config::{ config_add, config_delete, config_list } }; -use error_tools::Result; +use error_tools::untyped::Result; /// Struct that provides commands for config files. #[ derive( Debug ) ] diff --git a/module/move/unitore/src/command/feed.rs b/module/move/unitore/src/command/feed.rs index 148d404952..b6aeaccd0a 100644 --- a/module/move/unitore/src/command/feed.rs +++ b/module/move/unitore/src/command/feed.rs @@ -5,7 +5,7 @@ use gluesql::sled_storage::sled::Config; use wca::{ Command, VerifiedCommand }; use sled_adapter::FeedStorage; use action::{ Report, feed::feeds_list }; -use error_tools::Result; +use error_tools::untyped::Result; /// Struct that provides commands for feed. #[ derive( Debug ) ] diff --git a/module/move/unitore/src/command/frame.rs b/module/move/unitore/src/command/frame.rs index 8a4f18a756..230a704cfa 100644 --- a/module/move/unitore/src/command/frame.rs +++ b/module/move/unitore/src/command/frame.rs @@ -5,7 +5,7 @@ use gluesql::sled_storage::sled::Config; use wca::{ Command, VerifiedCommand }; use sled_adapter::FeedStorage; use action::{ Report, frame::{ frames_list, frames_download } }; -use error_tools::Result; +use error_tools::untyped::Result; /// Struct that provides commands for frames. #[ derive( Debug ) ] diff --git a/module/move/unitore/src/command/query.rs b/module/move/unitore/src/command/query.rs index 24519e1a86..67a76dffed 100644 --- a/module/move/unitore/src/command/query.rs +++ b/module/move/unitore/src/command/query.rs @@ -5,7 +5,7 @@ use gluesql::sled_storage::sled::Config; use wca::{ Command, Type, VerifiedCommand }; use sled_adapter::FeedStorage; use action::{ Report, query::query_execute }; -use error_tools::Result; +use error_tools::untyped::Result; /// Struct that provides commands for queries. #[ derive( Debug ) ] diff --git a/module/move/unitore/src/command/table.rs b/module/move/unitore/src/command/table.rs index 67c82f23a0..29f971695b 100644 --- a/module/move/unitore/src/command/table.rs +++ b/module/move/unitore/src/command/table.rs @@ -5,7 +5,7 @@ use gluesql::sled_storage::sled::Config; use wca::{ Command, Type, VerifiedCommand }; use sled_adapter::FeedStorage; use action::{ Report, table::{ table_list, tables_list } }; -use error_tools::Result; +use error_tools::untyped::Result; /// Struct that provides commands for table information. #[ derive( Debug ) ] diff --git a/module/move/unitore/src/entity/config.rs b/module/move/unitore/src/entity/config.rs index b28a90a1dc..92f9f550d6 100644 --- a/module/move/unitore/src/entity/config.rs +++ b/module/move/unitore/src/entity/config.rs @@ -1,6 +1,6 @@ //! Functionality for storing and retrieving config files. -use error_tools::Result; +use error_tools::untyped::Result; use gluesql::core::executor::Payload; /// Config file path. diff --git a/module/move/unitore/src/entity/feed.rs b/module/move/unitore/src/entity/feed.rs index 7084e841dd..449627e7ff 100644 --- a/module/move/unitore/src/entity/feed.rs +++ b/module/move/unitore/src/entity/feed.rs @@ -2,7 +2,7 @@ use crate::*; use std::time::Duration; -use error_tools::Result; +use error_tools::untyped::Result; use gluesql::core:: { ast_builder::{ null, text, timestamp, ExprNode }, diff --git a/module/move/unitore/src/entity/frame.rs b/module/move/unitore/src/entity/frame.rs index 8fb522ad58..23bc76718d 100644 --- a/module/move/unitore/src/entity/frame.rs +++ b/module/move/unitore/src/entity/frame.rs @@ -1,7 +1,7 @@ //! Frame storing and retrieving functionality. use crate::*; -use error_tools::Result; +use error_tools::untyped::Result; use gluesql::core:: { ast_builder::{ null, text, timestamp, ExprNode }, chrono::{ DateTime, SecondsFormat, Utc }, executor::Payload diff --git a/module/move/unitore/src/entity/table.rs b/module/move/unitore/src/entity/table.rs index b177c3c934..c0e5eb62b2 100644 --- a/module/move/unitore/src/entity/table.rs +++ b/module/move/unitore/src/entity/table.rs @@ -1,7 +1,7 @@ //! Functionality for storage tables information. use crate::*; -use error_tools::Result; +use error_tools::untyped::Result; use gluesql::prelude::Payload; use action::table::TablesReport; diff --git a/module/move/unitore/src/executor.rs b/module/move/unitore/src/executor.rs index 8010dbd9cc..c3cb899854 100644 --- a/module/move/unitore/src/executor.rs +++ b/module/move/unitore/src/executor.rs @@ -2,7 +2,7 @@ use crate::*; use wca::{ Dictionary, Executor, Parser, Verifier }; -use error_tools::Result; +use error_tools::untyped::Result; /// Run feed updates. pub fn execute() -> Result< (), Box< dyn std::error::Error + Send + Sync > > diff --git a/module/move/unitore/src/feed_config.rs b/module/move/unitore/src/feed_config.rs index 4cb2661fb3..d792c96fc1 100644 --- a/module/move/unitore/src/feed_config.rs +++ b/module/move/unitore/src/feed_config.rs @@ -1,7 +1,7 @@ //! Reading and parsing of subscription configuration file. use std::{ fs::OpenOptions, io::{ BufReader, Read } }; -use error_tools::{ untyped::Context, Result }; +use error_tools::{ untyped::Context, untyped::Result }; use serde::Deserialize; /// Configuration for subscription to feed resource. diff --git a/module/move/unitore/src/retriever.rs b/module/move/unitore/src/retriever.rs index b41c466c2d..203789ca5b 100644 --- a/module/move/unitore/src/retriever.rs +++ b/module/move/unitore/src/retriever.rs @@ -9,7 +9,7 @@ use hyper_util:: use http_body_util::{ Empty, BodyExt }; use hyper::body::Bytes; use feed_rs::parser as feed_parser; -use error_tools::{ Result, untyped::Context }; +use error_tools::{ untyped::Result, untyped::Context }; // qqq : purpose of trait if any? // aaa : removed unnecessary trait diff --git a/module/move/unitore/src/sled_adapter/config.rs b/module/move/unitore/src/sled_adapter/config.rs index a3b0cc73d8..a873c229df 100644 --- a/module/move/unitore/src/sled_adapter/config.rs +++ b/module/move/unitore/src/sled_adapter/config.rs @@ -1,7 +1,7 @@ //! Config file operation with Sled storage. use crate::*; -use error_tools::{ err, Result }; +use error_tools::{ err, untyped::Result }; use gluesql:: { core:: diff --git a/module/move/unitore/src/sled_adapter/feed.rs b/module/move/unitore/src/sled_adapter/feed.rs index 273cafd2bd..fda59782bb 100644 --- a/module/move/unitore/src/sled_adapter/feed.rs +++ b/module/move/unitore/src/sled_adapter/feed.rs @@ -2,7 +2,7 @@ use crate::*; use std::time::Duration; -use error_tools::{ Result, untyped::Context }; +use error_tools::{ untyped::Result, untyped::Context }; use gluesql:: { core:: @@ -25,7 +25,7 @@ use action:: frame::{ UpdateReport, SelectedEntries, FramesReport }, }; use sled_adapter::FeedStorage; -use wca::wtools::Itertools; +use wca::iter_tools::Itertools; #[ async_trait::async_trait( ?Send ) ] impl FeedStore for FeedStorage< SledStorage > diff --git a/module/move/unitore/src/sled_adapter/frame.rs b/module/move/unitore/src/sled_adapter/frame.rs index 43eccb8d8c..9bdaf2792d 100644 --- a/module/move/unitore/src/sled_adapter/frame.rs +++ b/module/move/unitore/src/sled_adapter/frame.rs @@ -2,7 +2,7 @@ use crate::*; use std::collections::HashMap; -use error_tools::{ Result, untyped::Context }; +use error_tools::{ untyped::Result, untyped::Context }; use gluesql:: { core:: @@ -16,7 +16,7 @@ use gluesql:: use entity::frame::{ FrameStore, Frame }; use action::frame::{ SelectedEntries, FramesReport, ListReport }; use sled_adapter::FeedStorage; -use wca::wtools::Itertools; +use wca::iter_tools::Itertools; #[ async_trait::async_trait( ?Send ) ] impl FrameStore for FeedStorage< SledStorage > diff --git a/module/move/unitore/src/sled_adapter/mod.rs b/module/move/unitore/src/sled_adapter/mod.rs index a07c44d942..9c63972e9e 100644 --- a/module/move/unitore/src/sled_adapter/mod.rs +++ b/module/move/unitore/src/sled_adapter/mod.rs @@ -2,7 +2,7 @@ use crate::*; use std::sync::Arc; -use error_tools::{ untyped::Context, Result }; +use error_tools::{ untyped::Context, untyped::Result }; use tokio::sync::Mutex; use gluesql:: { diff --git a/module/move/unitore/src/sled_adapter/table.rs b/module/move/unitore/src/sled_adapter/table.rs index 71763918ee..8acfd1001e 100644 --- a/module/move/unitore/src/sled_adapter/table.rs +++ b/module/move/unitore/src/sled_adapter/table.rs @@ -1,7 +1,7 @@ //! Table and columns info operations from Sled storage. use crate::*; -use error_tools::Result; +use error_tools::untyped::Result; use gluesql:: { core::executor::Payload, diff --git a/module/move/unitore/tests/basic.rs b/module/move/unitore/tests/basic.rs index 6e5df1ad4d..c14f8f278b 100644 --- a/module/move/unitore/tests/basic.rs +++ b/module/move/unitore/tests/basic.rs @@ -1,5 +1,5 @@ use feed_rs::parser as feed_parser; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn frame() -> Result< () > diff --git a/module/move/unitore/tests/config_add.rs b/module/move/unitore/tests/config_add.rs index 455a77dbd4..7f080622b8 100644 --- a/module/move/unitore/tests/config_add.rs +++ b/module/move/unitore/tests/config_add.rs @@ -6,7 +6,7 @@ use unitore:: entity::feed::FeedStore, action::config, }; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn config_add() -> Result< () > diff --git a/module/move/unitore/tests/config_delete.rs b/module/move/unitore/tests/config_delete.rs index 63a792725e..9a7ffdf10a 100644 --- a/module/move/unitore/tests/config_delete.rs +++ b/module/move/unitore/tests/config_delete.rs @@ -9,7 +9,7 @@ use unitore:: entity::config::ConfigStore, action::config, }; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn config_delete() -> Result< () > diff --git a/module/move/unitore/tests/frames_download.rs b/module/move/unitore/tests/frames_download.rs index ae8119a71d..11494838f9 100644 --- a/module/move/unitore/tests/frames_download.rs +++ b/module/move/unitore/tests/frames_download.rs @@ -8,14 +8,14 @@ use gluesql:: }, sled_storage::sled::Config, }; -use wca::wtools::Itertools; +use wca::iter_tools::Itertools; use unitore:: { feed_config::SubscriptionConfig, sled_adapter::FeedStorage, entity::{ frame::FrameStore, feed::FeedStore }, }; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn test_save() -> Result< () > diff --git a/module/move/unitore/tests/query_execute.rs b/module/move/unitore/tests/query_execute.rs index 7741575322..4215971781 100644 --- a/module/move/unitore/tests/query_execute.rs +++ b/module/move/unitore/tests/query_execute.rs @@ -14,7 +14,7 @@ use gluesql:: sled_storage::sled, }; use wca::{ VerifiedCommand, CommandsAggregator, Type, Parser, Dictionary, Verifier, Executor }; -use error_tools::Result; +use error_tools::untyped::Result; use mockall::predicate; use std::path::PathBuf; diff --git a/module/move/unitore/tests/table_list.rs b/module/move/unitore/tests/table_list.rs index 188d1a3131..ff06deae00 100644 --- a/module/move/unitore/tests/table_list.rs +++ b/module/move/unitore/tests/table_list.rs @@ -8,7 +8,7 @@ use unitore:: sled_adapter::FeedStorage, entity::table::TableStore, }; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn table_list() -> Result< () > diff --git a/module/move/unitore/tests/tables_list.rs b/module/move/unitore/tests/tables_list.rs index 0972041704..f740e94b08 100644 --- a/module/move/unitore/tests/tables_list.rs +++ b/module/move/unitore/tests/tables_list.rs @@ -4,7 +4,7 @@ use unitore:: sled_adapter::FeedStorage, entity::table::TableStore, }; -use error_tools::Result; +use error_tools::untyped::Result; #[ tokio::test ] async fn tables_list() -> Result< () >