From fc77980617d9ef179ecb1773f3d901f52790cfad Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 11 Dec 2017 12:45:07 -0500 Subject: Add basic derive's to all types ...though I may have missed some. But everything that can should now impl Debug, Copy, Clone, PartialEq, Eq, and Hash. --- ipfs-api/src/request/swarm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipfs-api/src/request/swarm.rs') diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index 53b9c93..f1988be 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct SwarmAddrsLocal; impl_skip_serialize!(SwarmAddrsLocal); @@ -20,7 +20,7 @@ impl ApiRequest for SwarmAddrsLocal { } } - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); -- cgit v1.2.3 From c58f396845ee421fc818ed8999103b241b495f1c Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 11 Dec 2017 13:25:50 -0500 Subject: Replaced path() method with associated const on ApiRequest trait --- ipfs-api/src/request/swarm.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'ipfs-api/src/request/swarm.rs') diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index f1988be..975282d 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -14,10 +14,7 @@ pub struct SwarmAddrsLocal; impl_skip_serialize!(SwarmAddrsLocal); impl ApiRequest for SwarmAddrsLocal { - #[inline] - fn path() -> &'static str { - "/swarm/addrs/local" - } + const path: &'static str = "/swarm/addrs/local"; } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -26,8 +23,5 @@ pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); impl ApiRequest for SwarmPeers { - #[inline] - fn path() -> &'static str { - "/swarm/peers" - } + const path: &'static str = "/swarm/peers"; } -- cgit v1.2.3 From 45077f90db50fbcb4d13e94b2ee336bf06222b88 Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 11 Dec 2017 13:30:53 -0500 Subject: Uppercased path->PATH in constants. --- ipfs-api/src/request/swarm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipfs-api/src/request/swarm.rs') diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index 975282d..b6b131a 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -14,7 +14,7 @@ pub struct SwarmAddrsLocal; impl_skip_serialize!(SwarmAddrsLocal); impl ApiRequest for SwarmAddrsLocal { - const path: &'static str = "/swarm/addrs/local"; + const PATH: &'static str = "/swarm/addrs/local"; } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -23,5 +23,5 @@ pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); impl ApiRequest for SwarmPeers { - const path: &'static str = "/swarm/peers"; + const PATH: &'static str = "/swarm/peers"; } -- cgit v1.2.3 From 07e2fa7acaf2b0309263629af4543428c06e771d Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Wed, 13 Dec 2017 10:09:15 -0500 Subject: Revert "Add basic derive's to all types" This reverts commit fc77980617d9ef179ecb1773f3d901f52790cfad. --- ipfs-api/src/request/swarm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipfs-api/src/request/swarm.rs') diff --git a/ipfs-api/src/request/swarm.rs b/ipfs-api/src/request/swarm.rs index b6b131a..3953fdb 100644 --- a/ipfs-api/src/request/swarm.rs +++ b/ipfs-api/src/request/swarm.rs @@ -8,7 +8,7 @@ use request::ApiRequest; -#[derive(Debug, Clone, PartialEq, Eq, Hash)] + pub struct SwarmAddrsLocal; impl_skip_serialize!(SwarmAddrsLocal); @@ -17,7 +17,7 @@ impl ApiRequest for SwarmAddrsLocal { const PATH: &'static str = "/swarm/addrs/local"; } -#[derive(Debug, Clone, PartialEq, Eq, Hash)] + pub struct SwarmPeers; impl_skip_serialize!(SwarmPeers); -- cgit v1.2.3