From c9ad7aa539269f1ec686d99ebd5fb8f9d18dc9e6 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Mon, 24 Feb 2025 00:00:00 +0000 Subject: [PATCH] refactor(app/integration): use `linkerd_app_core::Error` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `linkerd_app_integration` defines an `Error` alias. we have a boxed error type in `linkerd_app_core::Error` that achieves the same purpose, that we can use instead. this commit replaces this type alias with a reëxport of `linkerd_app_core::Error`. Signed-off-by: katelyn martin --- linkerd/app/integration/src/lib.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs index 38e89bf9fe..c578971148 100644 --- a/linkerd/app/integration/src/lib.rs +++ b/linkerd/app/integration/src/lib.rs @@ -28,7 +28,7 @@ pub use futures::{future, FutureExt, TryFuture, TryFutureExt}; pub use http::{HeaderMap, Request, Response, StatusCode}; pub use http_body::Body; pub use linkerd_app as app; -pub use linkerd_app_core::{drain, Addr}; +pub use linkerd_app_core::{drain, Addr, Error}; pub use linkerd_app_test::*; pub use linkerd_tracing::test::*; use socket2::Socket; @@ -50,8 +50,6 @@ pub use tower::Service; pub const ENV_TEST_PATIENCE_MS: &str = "RUST_TEST_PATIENCE_MS"; pub const DEFAULT_TEST_PATIENCE: Duration = Duration::from_millis(15); -pub type Error = Box; - /// Retry an assertion up to a specified number of times, waiting /// `RUST_TEST_PATIENCE_MS` between retries. ///