Skip to content

Commit

Permalink
Ensure we do not introduce conflicts with #1156
Browse files Browse the repository at this point in the history
  • Loading branch information
romac committed Sep 15, 2021
1 parent cff9ef1 commit 99e5840
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion modules/src/ics02_client/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::num::TryFromIntError;
use core::num::TryFromIntError;

use flex_error::{define_error, TraceError};

Expand Down
2 changes: 1 addition & 1 deletion relayer/src/event/monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub struct EventBatch {
pub events: Vec<IbcEvent>,
}

type SubscriptionResult = std::result::Result<RpcEvent, RpcError>;
type SubscriptionResult = core::result::Result<RpcEvent, RpcError>;
type SubscriptionStream = dyn Stream<Item = SubscriptionResult> + Send + Sync + Unpin;

pub type EventSender = channel::Sender<Result<EventBatch>>;
Expand Down

0 comments on commit 99e5840

Please sign in to comment.