From ce106caa88260251969ad4c3c3eeb1428f7abaed Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Wed, 22 May 2019 10:26:24 -0300 Subject: [PATCH 1/2] `ssz` is ambiguous (name vs any other name during import resolution) --- eth2/utils/ssz/src/macros.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth2/utils/ssz/src/macros.rs b/eth2/utils/ssz/src/macros.rs index ed50ffd041..b51d8897f5 100644 --- a/eth2/utils/ssz/src/macros.rs +++ b/eth2/utils/ssz/src/macros.rs @@ -51,7 +51,7 @@ macro_rules! impl_decode_via_from { #[cfg(test)] mod tests { use crate as ssz; - use ssz::{Decode, Encode}; + use self::ssz::{Decode, Encode}; #[derive(PartialEq, Debug, Clone, Copy)] struct Wrapper(u64); From f5bf4a861e94aebdb14e019be5fd43f6f258a6f5 Mon Sep 17 00:00:00 2001 From: Victor Lopez Date: Tue, 28 May 2019 01:55:16 +0000 Subject: [PATCH 2/2] Fmt fix Signed-off-by: Victor Lopez --- eth2/utils/ssz/src/macros.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eth2/utils/ssz/src/macros.rs b/eth2/utils/ssz/src/macros.rs index b51d8897f5..04147a8058 100644 --- a/eth2/utils/ssz/src/macros.rs +++ b/eth2/utils/ssz/src/macros.rs @@ -50,8 +50,8 @@ macro_rules! impl_decode_via_from { #[cfg(test)] mod tests { - use crate as ssz; use self::ssz::{Decode, Encode}; + use crate as ssz; #[derive(PartialEq, Debug, Clone, Copy)] struct Wrapper(u64);