Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/merino/src/curated_recommendations/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> = std::result::Result<T, Error>;
Expand Down
1 change: 0 additions & 1 deletion components/merino/src/suggest/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> = std::result::Result<T, Error>;
Expand Down
1 change: 0 additions & 1 deletion components/merino/src/worldcup/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> = std::result::Result<T, Error>;
Expand Down
2 changes: 1 addition & 1 deletion components/push/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T, E = PushError> = std::result::Result<T, E>;

Expand Down
1 change: 0 additions & 1 deletion components/relay/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down