From 6c39b1ab7a06f4431c1d62af28b44de5a7b87c26 Mon Sep 17 00:00:00 2001 From: Alex Hochheiden Date: Thu, 23 Jul 2026 16:14:28 -0700 Subject: [PATCH] Remove unused `error_support` macro re-exports in application-services components --- components/merino/src/curated_recommendations/error.rs | 2 +- components/merino/src/suggest/error.rs | 1 - components/merino/src/worldcup/error.rs | 1 - components/push/src/error.rs | 2 +- components/relay/src/error.rs | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/merino/src/curated_recommendations/error.rs b/components/merino/src/curated_recommendations/error.rs index eff201ef992..b4821fc9a67 100644 --- a/components/merino/src/curated_recommendations/error.rs +++ b/components/merino/src/curated_recommendations/error.rs @@ -4,7 +4,7 @@ use error_support::{ErrorHandling, GetErrorHandling}; // Re-export logging helpers. -pub use error_support::{error, trace}; +pub use error_support::trace; /// Internal convenience wrapper for `std::Result`. pub type Result = std::result::Result; diff --git a/components/merino/src/suggest/error.rs b/components/merino/src/suggest/error.rs index a4135b3493e..e4904dfb16c 100644 --- a/components/merino/src/suggest/error.rs +++ b/components/merino/src/suggest/error.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -pub use error_support::error; use error_support::{ErrorHandling, GetErrorHandling}; pub type Result = std::result::Result; diff --git a/components/merino/src/worldcup/error.rs b/components/merino/src/worldcup/error.rs index 2f5a420e60b..d1c36cb362e 100644 --- a/components/merino/src/worldcup/error.rs +++ b/components/merino/src/worldcup/error.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -pub use error_support::error; use error_support::{ErrorHandling, GetErrorHandling}; pub type Result = std::result::Result; diff --git a/components/push/src/error.rs b/components/push/src/error.rs index f642093cfbe..670dff7193d 100644 --- a/components/push/src/error.rs +++ b/components/push/src/error.rs @@ -4,7 +4,7 @@ use error_support::{ErrorHandling, GetErrorHandling}; // reexport logging helpers. -pub use error_support::{debug, error, info, warn}; +pub use error_support::{debug, info, warn}; pub type Result = std::result::Result; diff --git a/components/relay/src/error.rs b/components/relay/src/error.rs index 2a6f6ddbd46..d8f2536a10f 100644 --- a/components/relay/src/error.rs +++ b/components/relay/src/error.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -pub use error_support::error; use error_support::{ErrorHandling, GetErrorHandling}; use remote_settings::RemoteSettingsError;