From a553be92564770cbdc47285cfa295680887d7d2d Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Fri, 23 Aug 2024 17:53:28 +0800 Subject: [PATCH] refactor: Move all backoff in one mod Signed-off-by: Xuanwo --- src/{backoff.rs => backoff/api.rs} | 0 src/{ => backoff}/constant.rs | 4 ++-- src/{ => backoff}/exponential.rs | 4 ++-- src/{ => backoff}/fibonacci.rs | 4 ++-- src/backoff/mod.rs | 14 ++++++++++++++ src/blocking_retry_with_context.rs | 2 +- src/lib.rs | 15 +-------------- src/retry.rs | 2 +- src/retry_with_context.rs | 2 +- 9 files changed, 24 insertions(+), 23 deletions(-) rename src/{backoff.rs => backoff/api.rs} (100%) rename src/{ => backoff}/constant.rs (98%) rename src/{ => backoff}/exponential.rs (99%) rename src/{ => backoff}/fibonacci.rs (98%) create mode 100644 src/backoff/mod.rs diff --git a/src/backoff.rs b/src/backoff/api.rs similarity index 100% rename from src/backoff.rs rename to src/backoff/api.rs diff --git a/src/constant.rs b/src/backoff/constant.rs similarity index 98% rename from src/constant.rs rename to src/backoff/constant.rs index b648483..6fa3583 100644 --- a/src/constant.rs +++ b/src/backoff/constant.rs @@ -132,8 +132,8 @@ mod tests { #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::wasm_bindgen_test as test; - use crate::backoff::BackoffBuilder; - use crate::constant::ConstantBuilder; + use crate::BackoffBuilder; + use crate::ConstantBuilder; #[test] fn test_constant_default() { diff --git a/src/exponential.rs b/src/backoff/exponential.rs similarity index 99% rename from src/exponential.rs rename to src/backoff/exponential.rs index c02b338..b2c2cee 100644 --- a/src/exponential.rs +++ b/src/backoff/exponential.rs @@ -183,8 +183,8 @@ mod tests { #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::wasm_bindgen_test as test; - use crate::backoff::BackoffBuilder; - use crate::exponential::ExponentialBuilder; + use crate::BackoffBuilder; + use crate::ExponentialBuilder; #[test] fn test_exponential_default() { diff --git a/src/fibonacci.rs b/src/backoff/fibonacci.rs similarity index 98% rename from src/fibonacci.rs rename to src/backoff/fibonacci.rs index d741c34..64a9b69 100644 --- a/src/fibonacci.rs +++ b/src/backoff/fibonacci.rs @@ -167,8 +167,8 @@ mod tests { #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::wasm_bindgen_test as test; - use crate::backoff::BackoffBuilder; - use crate::fibonacci::FibonacciBuilder; + use crate::BackoffBuilder; + use crate::FibonacciBuilder; #[test] fn test_fibonacci_default() { diff --git a/src/backoff/mod.rs b/src/backoff/mod.rs new file mode 100644 index 0000000..14d0b19 --- /dev/null +++ b/src/backoff/mod.rs @@ -0,0 +1,14 @@ +mod api; +pub use api::*; + +mod constant; +pub use constant::ConstantBackoff; +pub use constant::ConstantBuilder; + +mod fibonacci; +pub use fibonacci::FibonacciBackoff; +pub use fibonacci::FibonacciBuilder; + +mod exponential; +pub use exponential::ExponentialBackoff; +pub use exponential::ExponentialBuilder; diff --git a/src/blocking_retry_with_context.rs b/src/blocking_retry_with_context.rs index 139760f..9dabc3c 100644 --- a/src/blocking_retry_with_context.rs +++ b/src/blocking_retry_with_context.rs @@ -149,7 +149,7 @@ mod tests { use std::sync::Mutex; use super::*; - use crate::exponential::ExponentialBuilder; + use crate::ExponentialBuilder; use anyhow::Result; struct Test; diff --git a/src/lib.rs b/src/lib.rs index ef4d7d9..93116cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -159,20 +159,7 @@ #![deny(unused_qualifications)] mod backoff; -pub use backoff::Backoff; -pub use backoff::BackoffBuilder; - -mod constant; -pub use constant::ConstantBackoff; -pub use constant::ConstantBuilder; - -mod exponential; -pub use exponential::ExponentialBackoff; -pub use exponential::ExponentialBuilder; - -mod fibonacci; -pub use fibonacci::FibonacciBackoff; -pub use fibonacci::FibonacciBuilder; +pub use backoff::*; mod retry; pub use retry::Retry; diff --git a/src/retry.rs b/src/retry.rs index 8257fb7..5004be1 100644 --- a/src/retry.rs +++ b/src/retry.rs @@ -340,7 +340,7 @@ mod tests { use tokio::test; use super::*; - use crate::exponential::ExponentialBuilder; + use crate::ExponentialBuilder; async fn always_error() -> anyhow::Result<()> { Err(anyhow::anyhow!("test_query meets error")) diff --git a/src/retry_with_context.rs b/src/retry_with_context.rs index 8e1f6bf..6f6889e 100644 --- a/src/retry_with_context.rs +++ b/src/retry_with_context.rs @@ -373,7 +373,7 @@ mod tests { use tokio::test; use super::*; - use crate::exponential::ExponentialBuilder; + use crate::ExponentialBuilder; struct Test;