From b4aa3a4504bfc929acf98e436c5842c57cb37fa6 Mon Sep 17 00:00:00 2001 From: Hirrolot <hirrolot@gmail.com> Date: Sat, 5 Feb 2022 02:37:01 +0600 Subject: [PATCH] Move `storage` back to `dispatching` --- src/dispatching/dialogue/mod.rs | 9 ++++----- .../dialogue/storage/in_mem_storage.rs | 0 .../dialogue/storage/mod.rs | 0 .../dialogue/storage/redis_storage.rs | 0 .../dialogue/storage/serializer.rs | 0 .../dialogue/storage/sqlite_storage.rs | 0 .../dialogue/storage/trace_storage.rs | 0 src/dispatching2/dialogue/mod.rs | 9 +++++---- 8 files changed, 9 insertions(+), 9 deletions(-) rename src/{dispatching2 => dispatching}/dialogue/storage/in_mem_storage.rs (100%) rename src/{dispatching2 => dispatching}/dialogue/storage/mod.rs (100%) rename src/{dispatching2 => dispatching}/dialogue/storage/redis_storage.rs (100%) rename src/{dispatching2 => dispatching}/dialogue/storage/serializer.rs (100%) rename src/{dispatching2 => dispatching}/dialogue/storage/sqlite_storage.rs (100%) rename src/{dispatching2 => dispatching}/dialogue/storage/trace_storage.rs (100%) diff --git a/src/dispatching/dialogue/mod.rs b/src/dispatching/dialogue/mod.rs index 0ff90d8f..962c27f6 100644 --- a/src/dispatching/dialogue/mod.rs +++ b/src/dispatching/dialogue/mod.rs @@ -148,6 +148,7 @@ mod dialogue_dispatcher_handler; mod dialogue_stage; mod dialogue_with_cx; mod get_chat_id; +mod storage; mod transition; pub use dialogue_dispatcher::DialogueDispatcher; @@ -165,11 +166,9 @@ pub use teloxide_macros::Transition; #[cfg(feature = "redis-storage")] #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "redis-storage")))] -pub use crate::dispatching2::dialogue::{RedisStorage, RedisStorageError}; +pub use storage::{RedisStorage, RedisStorageError}; #[cfg(feature = "sqlite-storage")] -pub use crate::dispatching2::dialogue::{SqliteStorage, SqliteStorageError}; +pub use storage::{SqliteStorage, SqliteStorageError}; -pub use crate::dispatching2::dialogue::{ - serializer, InMemStorage, InMemStorageError, Serializer, Storage, TraceStorage, -}; +pub use storage::{serializer, InMemStorage, InMemStorageError, Serializer, Storage, TraceStorage}; diff --git a/src/dispatching2/dialogue/storage/in_mem_storage.rs b/src/dispatching/dialogue/storage/in_mem_storage.rs similarity index 100% rename from src/dispatching2/dialogue/storage/in_mem_storage.rs rename to src/dispatching/dialogue/storage/in_mem_storage.rs diff --git a/src/dispatching2/dialogue/storage/mod.rs b/src/dispatching/dialogue/storage/mod.rs similarity index 100% rename from src/dispatching2/dialogue/storage/mod.rs rename to src/dispatching/dialogue/storage/mod.rs diff --git a/src/dispatching2/dialogue/storage/redis_storage.rs b/src/dispatching/dialogue/storage/redis_storage.rs similarity index 100% rename from src/dispatching2/dialogue/storage/redis_storage.rs rename to src/dispatching/dialogue/storage/redis_storage.rs diff --git a/src/dispatching2/dialogue/storage/serializer.rs b/src/dispatching/dialogue/storage/serializer.rs similarity index 100% rename from src/dispatching2/dialogue/storage/serializer.rs rename to src/dispatching/dialogue/storage/serializer.rs diff --git a/src/dispatching2/dialogue/storage/sqlite_storage.rs b/src/dispatching/dialogue/storage/sqlite_storage.rs similarity index 100% rename from src/dispatching2/dialogue/storage/sqlite_storage.rs rename to src/dispatching/dialogue/storage/sqlite_storage.rs diff --git a/src/dispatching2/dialogue/storage/trace_storage.rs b/src/dispatching/dialogue/storage/trace_storage.rs similarity index 100% rename from src/dispatching2/dialogue/storage/trace_storage.rs rename to src/dispatching/dialogue/storage/trace_storage.rs diff --git a/src/dispatching2/dialogue/mod.rs b/src/dispatching2/dialogue/mod.rs index 012be2bd..5222b1a7 100644 --- a/src/dispatching2/dialogue/mod.rs +++ b/src/dispatching2/dialogue/mod.rs @@ -87,18 +87,19 @@ #[cfg(feature = "redis-storage")] #[cfg_attr(all(docsrs, feature = "nightly"), doc(cfg(feature = "redis-storage")))] -pub use storage::{RedisStorage, RedisStorageError}; +pub use crate::dispatching::dialogue::{RedisStorage, RedisStorageError}; #[cfg(feature = "sqlite-storage")] -pub use storage::{SqliteStorage, SqliteStorageError}; +pub use crate::dispatching::dialogue::{SqliteStorage, SqliteStorageError}; +pub use crate::dispatching::dialogue::{ + serializer, InMemStorage, InMemStorageError, Serializer, Storage, TraceStorage, +}; pub use get_chat_id::GetChatId; -pub use storage::{serializer, InMemStorage, InMemStorageError, Serializer, Storage, TraceStorage}; use std::{marker::PhantomData, sync::Arc}; mod get_chat_id; -mod storage; /// A handle for controlling dialogue state. #[derive(Debug)]