Skip to content

Commit

Permalink
fix broken beta compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
rphmeier committed Sep 29, 2016
1 parent 01018b4 commit eb4e001
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion ethkey/src/signature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use bigint::hash::{H520, H256, FixedHash};
use {Secret, Public, SECP256K1, Error, Message, public_to_address, Address};

#[repr(C)]
#[derive(Eq)]
pub struct Signature([u8; 65]);

impl Signature {
Expand Down Expand Up @@ -76,6 +75,9 @@ impl PartialEq for Signature {
}
}

// manual implementation required in Rust 1.13+, see `std::cmp::AssertParamIsEq`.
impl Eq for Signature { }

// also manual for the same reason, but the pretty printing might be useful.
impl fmt::Debug for Signature {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
Expand Down
3 changes: 2 additions & 1 deletion rpc/src/v1/types/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ use util::{H64 as Eth64, H160 as Eth160, H256 as Eth256, H520 as Eth520, H512 as
macro_rules! impl_hash {
($name: ident, $other: ident, $size: expr) => {
/// Hash serialization
#[derive(Eq)]
pub struct $name([u8; $size]);

impl Eq for $name { }

impl Default for $name {
fn default() -> Self {
$name([0; $size])
Expand Down
4 changes: 3 additions & 1 deletion rpc/src/v1/types/uint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ use util::{U256 as EthU256, Uint};
macro_rules! impl_uint {
($name: ident, $other: ident, $size: expr) => {
/// Uint serialization.
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Debug, Default, Clone, Copy, PartialEq, Hash)]
pub struct $name($other);

impl Eq for $name { }

impl<T> From<T> for $name where $other: From<T> {
fn from(o: T) -> Self {
$name($other::from(o))
Expand Down

0 comments on commit eb4e001

Please sign in to comment.