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/add.rs | 2 +- ipfs-api/src/request/bitswap.rs | 8 ++++---- ipfs-api/src/request/block.rs | 8 ++++---- ipfs-api/src/request/bootstrap.rs | 6 +++--- ipfs-api/src/request/cat.rs | 2 +- ipfs-api/src/request/commands.rs | 2 +- ipfs-api/src/request/config.rs | 6 +++--- ipfs-api/src/request/dag.rs | 4 ++-- ipfs-api/src/request/dht.rs | 12 ++++++------ ipfs-api/src/request/diag.rs | 6 +++--- ipfs-api/src/request/dns.rs | 2 +- ipfs-api/src/request/file.rs | 2 +- ipfs-api/src/request/files.rs | 18 +++++++++--------- ipfs-api/src/request/filestore.rs | 6 +++--- ipfs-api/src/request/get.rs | 2 +- ipfs-api/src/request/id.rs | 2 +- ipfs-api/src/request/key.rs | 6 +++--- ipfs-api/src/request/log.rs | 8 +++++--- ipfs-api/src/request/ls.rs | 2 +- ipfs-api/src/request/object.rs | 8 ++++---- ipfs-api/src/request/pin.rs | 6 +++--- ipfs-api/src/request/ping.rs | 3 +-- ipfs-api/src/request/pubsub.rs | 8 ++++---- ipfs-api/src/request/refs.rs | 2 +- ipfs-api/src/request/stats.rs | 6 +++--- ipfs-api/src/request/swarm.rs | 4 ++-- ipfs-api/src/request/tar.rs | 4 ++-- ipfs-api/src/request/version.rs | 2 +- ipfs-api/src/response/add.rs | 2 +- ipfs-api/src/response/block.rs | 6 +++--- ipfs-api/src/response/commands.rs | 4 ++-- ipfs-api/src/response/dag.rs | 6 +++--- ipfs-api/src/response/dns.rs | 2 +- ipfs-api/src/response/error.rs | 2 +- ipfs-api/src/response/file.rs | 4 ++-- ipfs-api/src/response/files.rs | 6 +++--- ipfs-api/src/response/filestore.rs | 4 ++-- ipfs-api/src/response/id.rs | 2 +- ipfs-api/src/response/key.rs | 4 ++-- ipfs-api/src/response/log.rs | 4 ++-- ipfs-api/src/response/ls.rs | 6 +++--- ipfs-api/src/response/mod.rs | 3 +-- ipfs-api/src/response/mount.rs | 2 +- ipfs-api/src/response/name.rs | 4 ++-- ipfs-api/src/response/object.rs | 22 +++++++++++----------- ipfs-api/src/response/pin.rs | 9 ++++----- ipfs-api/src/response/ping.rs | 2 +- ipfs-api/src/response/pubsub.rs | 7 +++---- ipfs-api/src/response/refs.rs | 2 +- ipfs-api/src/response/repo.rs | 10 +++++----- ipfs-api/src/response/resolve.rs | 2 +- ipfs-api/src/response/stats.rs | 2 +- ipfs-api/src/response/swarm.rs | 16 ++++++++-------- ipfs-api/src/response/tar.rs | 2 +- ipfs-api/src/response/version.rs | 2 +- 55 files changed, 141 insertions(+), 143 deletions(-) diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs index 31458ea..5f03db5 100644 --- a/ipfs-api/src/request/add.rs +++ b/ipfs-api/src/request/add.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Add; impl_skip_serialize!(Add); diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs index 0c0953e..4ada208 100644 --- a/ipfs-api/src/request/bitswap.rs +++ b/ipfs-api/src/request/bitswap.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BitswapLedger<'a> { #[serde(rename = "arg")] pub peer: &'a str, @@ -22,7 +22,7 @@ impl<'a> ApiRequest for BitswapLedger<'a> { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BitswapStat; impl_skip_serialize!(BitswapStat); @@ -35,7 +35,7 @@ impl ApiRequest for BitswapStat { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BitswapUnwant<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -49,7 +49,7 @@ impl<'a> ApiRequest for BitswapUnwant<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BitswapWantlist<'a> { pub peer: Option<&'a str>, } diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs index 8409e0f..02583fe 100644 --- a/ipfs-api/src/request/block.rs +++ b/ipfs-api/src/request/block.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BlockGet<'a> { #[serde(rename = "arg")] pub hash: &'a str, @@ -22,7 +22,7 @@ impl<'a> ApiRequest for BlockGet<'a> { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BlockPut; impl_skip_serialize!(BlockPut); @@ -35,7 +35,7 @@ impl ApiRequest for BlockPut { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BlockRm<'a> { #[serde(rename = "arg")] pub hash: &'a str, @@ -49,7 +49,7 @@ impl<'a> ApiRequest for BlockRm<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BlockStat<'a> { #[serde(rename = "arg")] pub hash: &'a str, diff --git a/ipfs-api/src/request/bootstrap.rs b/ipfs-api/src/request/bootstrap.rs index 3ff8bf8..adbfd19 100644 --- a/ipfs-api/src/request/bootstrap.rs +++ b/ipfs-api/src/request/bootstrap.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BootstrapAddDefault; impl_skip_serialize!(BootstrapAddDefault); @@ -20,7 +20,7 @@ impl ApiRequest for BootstrapAddDefault { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BootstrapList; impl_skip_serialize!(BootstrapList); @@ -32,7 +32,7 @@ impl ApiRequest for BootstrapList { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct BootstrapRmAll; impl_skip_serialize!(BootstrapRmAll); diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs index ec182e3..d14a6e8 100644 --- a/ipfs-api/src/request/cat.rs +++ b/ipfs-api/src/request/cat.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Cat<'a> { #[serde(rename = "arg")] pub path: &'a str, diff --git a/ipfs-api/src/request/commands.rs b/ipfs-api/src/request/commands.rs index 515ddb5..609a2cd 100644 --- a/ipfs-api/src/request/commands.rs +++ b/ipfs-api/src/request/commands.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Commands; impl_skip_serialize!(Commands); diff --git a/ipfs-api/src/request/config.rs b/ipfs-api/src/request/config.rs index d018056..b70d981 100644 --- a/ipfs-api/src/request/config.rs +++ b/ipfs-api/src/request/config.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ConfigEdit; impl_skip_serialize!(ConfigEdit); @@ -20,7 +20,7 @@ impl ApiRequest for ConfigEdit { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ConfigReplace; impl_skip_serialize!(ConfigReplace); @@ -32,7 +32,7 @@ impl ApiRequest for ConfigReplace { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ConfigShow; impl_skip_serialize!(ConfigShow); diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs index 5e9e237..a3a64a9 100644 --- a/ipfs-api/src/request/dag.rs +++ b/ipfs-api/src/request/dag.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DagGet<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -22,7 +22,7 @@ impl<'a> ApiRequest for DagGet<'a> { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DagPut; impl_skip_serialize!(DagPut); diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs index 877a69a..9677215 100644 --- a/ipfs-api/src/request/dht.rs +++ b/ipfs-api/src/request/dht.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtFindPeer<'a> { #[serde(rename = "arg")] pub peer: &'a str, @@ -23,7 +23,7 @@ impl<'a> ApiRequest for DhtFindPeer<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtFindProvs<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -37,7 +37,7 @@ impl<'a> ApiRequest for DhtFindProvs<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtGet<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -51,7 +51,7 @@ impl<'a> ApiRequest for DhtGet<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtProvide<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -65,7 +65,7 @@ impl<'a> ApiRequest for DhtProvide<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtPut<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -82,7 +82,7 @@ impl<'a> ApiRequest for DhtPut<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DhtQuery<'a> { #[serde(rename = "arg")] pub peer: &'a str, diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs index 315d474..2045e83 100644 --- a/ipfs-api/src/request/diag.rs +++ b/ipfs-api/src/request/diag.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DiagCmdsClear; impl_skip_serialize!(DiagCmdsClear); @@ -21,7 +21,7 @@ impl ApiRequest for DiagCmdsClear { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DiagCmdsSetTime<'a> { #[serde(rename = "arg")] pub time: &'a str, @@ -34,7 +34,7 @@ impl<'a> ApiRequest for DiagCmdsSetTime<'a> { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct DiagSys; impl_skip_serialize!(DiagSys); diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs index 4ac2000..b9666b3 100644 --- a/ipfs-api/src/request/dns.rs +++ b/ipfs-api/src/request/dns.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Dns<'a> { #[serde(rename = "arg")] pub link: &'a str, diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs index 4d8c42f..b0c0bc2 100644 --- a/ipfs-api/src/request/file.rs +++ b/ipfs-api/src/request/file.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FileLs<'a> { #[serde(rename = "arg")] pub path: &'a str, diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs index 96e4516..a986ebe 100644 --- a/ipfs-api/src/request/files.rs +++ b/ipfs-api/src/request/files.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesCp<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -26,7 +26,7 @@ impl<'a> ApiRequest for FilesCp<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesFlush<'a> { #[serde(rename = "arg")] pub path: &'a Option<&'a str>, @@ -40,7 +40,7 @@ impl<'a> ApiRequest for FilesFlush<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesLs<'a> { #[serde(rename = "arg")] pub path: &'a Option<&'a str>, @@ -54,7 +54,7 @@ impl<'a> ApiRequest for FilesLs<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesMkdir<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -70,7 +70,7 @@ impl<'a> ApiRequest for FilesMkdir<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesMv<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -87,7 +87,7 @@ impl<'a> ApiRequest for FilesMv<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesRead<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -101,7 +101,7 @@ impl<'a> ApiRequest for FilesRead<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesRm<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -117,7 +117,7 @@ impl<'a> ApiRequest for FilesRm<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesStat<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -131,7 +131,7 @@ impl<'a> ApiRequest for FilesStat<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilesWrite<'a> { #[serde(rename = "arg")] pub path: &'a str, diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs index 93554f9..4ad57e0 100644 --- a/ipfs-api/src/request/filestore.rs +++ b/ipfs-api/src/request/filestore.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilestoreDups; impl_skip_serialize!(FilestoreDups); @@ -21,7 +21,7 @@ impl ApiRequest for FilestoreDups { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilestoreLs<'a> { #[serde(rename = "arg")] pub cid: &'a Option<&'a str>, @@ -35,7 +35,7 @@ impl<'a> ApiRequest for FilestoreLs<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct FilestoreVerify<'a> { #[serde(rename = "arg")] pub cid: &'a Option<&'a str>, diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs index c33bd4b..87a414f 100644 --- a/ipfs-api/src/request/get.rs +++ b/ipfs-api/src/request/get.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Get<'a> { #[serde(rename = "arg")] pub path: &'a str, diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs index 1677fd6..8b4ed39 100644 --- a/ipfs-api/src/request/id.rs +++ b/ipfs-api/src/request/id.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Id<'a> { #[serde(rename = "arg")] pub peer: &'a Option<&'a str>, diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs index 771c48d..fa27e11 100644 --- a/ipfs-api/src/request/key.rs +++ b/ipfs-api/src/request/key.rs @@ -10,7 +10,7 @@ use request::ApiRequest; use serde::ser::{Serialize, Serializer}; -#[derive(Copy, Clone)] +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub enum KeyType { Rsa, Ed25519, @@ -31,7 +31,7 @@ impl Serialize for KeyType { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct KeyGen<'a, 'b> { #[serde(rename = "arg")] pub name: &'a str, @@ -49,7 +49,7 @@ impl<'a, 'b> ApiRequest for KeyGen<'a, 'b> { } } - +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct KeyList; impl_skip_serialize!(KeyList); diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs index 7a48e5f..5f22a40 100644 --- a/ipfs-api/src/request/log.rs +++ b/ipfs-api/src/request/log.rs @@ -11,7 +11,7 @@ use serde::ser::{Serialize, Serializer}; use std::borrow::Cow; -#[derive(Copy, Clone)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] pub enum LoggingLevel { Debug, Info, @@ -37,7 +37,7 @@ impl Serialize for LoggingLevel { } } - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum Logger<'a> { All, Specific(Cow<'a, str>), @@ -58,7 +58,7 @@ impl<'a> Serialize for Logger<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Clone, PartialEq, Eq, Hash)] pub struct LogLevel<'a> { #[serde(rename = "arg")] pub logger: Logger<'a>, @@ -75,6 +75,7 @@ impl<'a> ApiRequest for LogLevel<'a> { } +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct LogLs; impl_skip_serialize!(LogLs); @@ -87,6 +88,7 @@ impl ApiRequest for LogLs { } +#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct LogTail; impl_skip_serialize!(LogTail); diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs index 24136cf..a6c66ba 100644 --- a/ipfs-api/src/request/ls.rs +++ b/ipfs-api/src/request/ls.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Ls<'a> { #[serde(rename = "arg")] pub path: &'a Option<&'a str>, diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs index c35a3a4..97bdfad 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ObjectDiff<'a> { #[serde(rename = "arg")] pub key0: &'a str, @@ -26,7 +26,7 @@ impl<'a> ApiRequest for ObjectDiff<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ObjectGet<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -40,7 +40,7 @@ impl<'a> ApiRequest for ObjectGet<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ObjectLinks<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -54,7 +54,7 @@ impl<'a> ApiRequest for ObjectLinks<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct ObjectStat<'a> { #[serde(rename = "arg")] pub key: &'a str, diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs index 6ee60b1..0d06bbe 100644 --- a/ipfs-api/src/request/pin.rs +++ b/ipfs-api/src/request/pin.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PinAdd<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -25,7 +25,7 @@ impl<'a> ApiRequest for PinAdd<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PinLs<'a> { #[serde(rename = "arg")] pub key: &'a Option<&'a str>, @@ -42,7 +42,7 @@ impl<'a> ApiRequest for PinLs<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PinRm<'a> { #[serde(rename = "arg")] pub key: &'a str, diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs index ef93476..601a463 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -8,8 +8,7 @@ use request::ApiRequest; - -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct Ping<'a, 'b> { #[serde(rename = "arg")] pub peer: &'a str, diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs index b14ccd6..d089c2a 100644 --- a/ipfs-api/src/request/pubsub.rs +++ b/ipfs-api/src/request/pubsub.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PubsubLs; impl_skip_serialize!(PubsubLs); @@ -21,7 +21,7 @@ impl ApiRequest for PubsubLs { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PubsubPeers<'a> { #[serde(rename = "arg")] pub topic: &'a Option<&'a str>, @@ -35,7 +35,7 @@ impl<'a> ApiRequest for PubsubPeers<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PubsubPub<'a> { #[serde(rename = "arg")] pub topic: &'a str, @@ -52,7 +52,7 @@ impl<'a> ApiRequest for PubsubPub<'a> { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct PubsubSub<'a> { #[serde(rename = "arg")] pub topic: &'a str, diff --git a/ipfs-api/src/request/refs.rs b/ipfs-api/src/request/refs.rs index 6c49b97..c0df0f8 100644 --- a/ipfs-api/src/request/refs.rs +++ b/ipfs-api/src/request/refs.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct RefsLocal; impl_skip_serialize!(RefsLocal); diff --git a/ipfs-api/src/request/stats.rs b/ipfs-api/src/request/stats.rs index b3e269b..1caa257 100644 --- a/ipfs-api/src/request/stats.rs +++ b/ipfs-api/src/request/stats.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct StatsBitswap; impl_skip_serialize!(StatsBitswap); @@ -20,7 +20,7 @@ impl ApiRequest for StatsBitswap { } } - +#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct StatsBw; impl_skip_serialize!(StatsBw); @@ -32,7 +32,7 @@ impl ApiRequest for StatsBw { } } - +#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct StatsRepo; impl_skip_serialize!(StatsRepo); 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); diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs index b97080b..33d5004 100644 --- a/ipfs-api/src/request/tar.rs +++ b/ipfs-api/src/request/tar.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct TarAdd; impl_skip_serialize!(TarAdd); @@ -21,7 +21,7 @@ impl ApiRequest for TarAdd { } -#[derive(Serialize)] +#[derive(Serialize, Debug, Clone, PartialEq, Eq, Hash)] pub struct TarCat<'a> { #[serde(rename = "arg")] pub path: &'a str, diff --git a/ipfs-api/src/request/version.rs b/ipfs-api/src/request/version.rs index e637a56..dc7081c 100644 --- a/ipfs-api/src/request/version.rs +++ b/ipfs-api/src/request/version.rs @@ -8,7 +8,7 @@ use request::ApiRequest; - +#[derive(Debug, Clone, PartialEq, Eq, Hash)] pub struct Version; impl_skip_serialize!(Version); diff --git a/ipfs-api/src/response/add.rs b/ipfs-api/src/response/add.rs index 24c82ac..e606f6e 100644 --- a/ipfs-api/src/response/add.rs +++ b/ipfs-api/src/response/add.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct AddResponse { pub name: String, diff --git a/ipfs-api/src/response/block.rs b/ipfs-api/src/response/block.rs index 34855e2..5177300 100644 --- a/ipfs-api/src/response/block.rs +++ b/ipfs-api/src/response/block.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct BlockPutResponse { pub key: String, @@ -14,7 +14,7 @@ pub struct BlockPutResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct BlockRmResponse { pub hash: String, @@ -22,7 +22,7 @@ pub struct BlockRmResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct BlockStatResponse { pub key: String, diff --git a/ipfs-api/src/response/commands.rs b/ipfs-api/src/response/commands.rs index bbdeaaa..0cf8f6f 100644 --- a/ipfs-api/src/response/commands.rs +++ b/ipfs-api/src/response/commands.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct CommandsResponseOptions { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,7 +17,7 @@ pub struct CommandsResponseOptions { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct CommandsResponse { pub name: String, diff --git a/ipfs-api/src/response/dag.rs b/ipfs-api/src/response/dag.rs index 6d5e25b..ae9ae1e 100644 --- a/ipfs-api/src/response/dag.rs +++ b/ipfs-api/src/response/dag.rs @@ -10,7 +10,7 @@ use response::serde; use std::collections::HashMap; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct DagIpfsHeader { pub name: String, @@ -21,7 +21,7 @@ pub struct DagIpfsHeader { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] pub struct DagGetResponse { pub data: Option, @@ -30,7 +30,7 @@ pub struct DagGetResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct DagPutResponse { pub cid: String, diff --git a/ipfs-api/src/response/dns.rs b/ipfs-api/src/response/dns.rs index 69f79d2..64b909a 100644 --- a/ipfs-api/src/response/dns.rs +++ b/ipfs-api/src/response/dns.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct DnsResponse { pub path: String, diff --git a/ipfs-api/src/response/error.rs b/ipfs-api/src/response/error.rs index 5f67eec..6222a08 100644 --- a/ipfs-api/src/response/error.rs +++ b/ipfs-api/src/response/error.rs @@ -12,7 +12,7 @@ use serde_urlencoded; use std::string::FromUtf8Error; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ApiError { pub message: String, diff --git a/ipfs-api/src/response/file.rs b/ipfs-api/src/response/file.rs index 7623135..d220dcf 100644 --- a/ipfs-api/src/response/file.rs +++ b/ipfs-api/src/response/file.rs @@ -10,7 +10,7 @@ use response::{serde, IpfsHeader}; use std::collections::HashMap; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct IpfsDetailedFile { pub hash: String, @@ -24,7 +24,7 @@ pub struct IpfsDetailedFile { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct FileLsResponse { #[serde(deserialize_with = "serde::deserialize_hashmap")] diff --git a/ipfs-api/src/response/files.rs b/ipfs-api/src/response/files.rs index 1b073de..fdcd873 100644 --- a/ipfs-api/src/response/files.rs +++ b/ipfs-api/src/response/files.rs @@ -15,7 +15,7 @@ pub type FilesCpResponse = (); pub type FilesFlushResponse = (); -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct FilesEntry { pub name: String, @@ -29,7 +29,7 @@ pub struct FilesEntry { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct FilesLsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -46,7 +46,7 @@ pub type FilesMvResponse = (); pub type FilesRmResponse = (); -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct FilesStatResponse { pub hash: String, diff --git a/ipfs-api/src/response/filestore.rs b/ipfs-api/src/response/filestore.rs index f2f62e5..e766eb7 100644 --- a/ipfs-api/src/response/filestore.rs +++ b/ipfs-api/src/response/filestore.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct FilestoreDupsResponse { #[serde(rename = "Ref")] @@ -16,7 +16,7 @@ pub struct FilestoreDupsResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct FilestoreObject { pub status: i32, diff --git a/ipfs-api/src/response/id.rs b/ipfs-api/src/response/id.rs index 72a0569..678a8a4 100644 --- a/ipfs-api/src/response/id.rs +++ b/ipfs-api/src/response/id.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct IdResponse { #[serde(rename = "ID")] diff --git a/ipfs-api/src/response/key.rs b/ipfs-api/src/response/key.rs index 2eb7de7..3bbe7c6 100644 --- a/ipfs-api/src/response/key.rs +++ b/ipfs-api/src/response/key.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct KeyGenResponse { pub name: String, @@ -17,7 +17,7 @@ pub struct KeyGenResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct KeyListResponse { #[serde(deserialize_with = "serde::deserialize_vec")] diff --git a/ipfs-api/src/response/log.rs b/ipfs-api/src/response/log.rs index 643d341..786cbdf 100644 --- a/ipfs-api/src/response/log.rs +++ b/ipfs-api/src/response/log.rs @@ -9,14 +9,14 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct LogLevelResponse { pub message: String, } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct LogLsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] diff --git a/ipfs-api/src/response/ls.rs b/ipfs-api/src/response/ls.rs index fa9a26b..b8a7c5a 100644 --- a/ipfs-api/src/response/ls.rs +++ b/ipfs-api/src/response/ls.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct IpfsFile { pub hash: String, @@ -19,7 +19,7 @@ pub struct IpfsFile { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct IpfsFileHeader { pub name: String, @@ -31,7 +31,7 @@ pub struct IpfsFileHeader { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct LsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] diff --git a/ipfs-api/src/response/mod.rs b/ipfs-api/src/response/mod.rs index e42c067..5fe9413 100644 --- a/ipfs-api/src/response/mod.rs +++ b/ipfs-api/src/response/mod.rs @@ -92,8 +92,7 @@ mod swarm; mod tar; mod version; - -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct IpfsHeader { pub name: String, diff --git a/ipfs-api/src/response/mount.rs b/ipfs-api/src/response/mount.rs index 1479aa3..c5c9bf9 100644 --- a/ipfs-api/src/response/mount.rs +++ b/ipfs-api/src/response/mount.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct MountResponse { #[serde(rename = "IPFS")] diff --git a/ipfs-api/src/response/name.rs b/ipfs-api/src/response/name.rs index 00d8cda..7ca952a 100644 --- a/ipfs-api/src/response/name.rs +++ b/ipfs-api/src/response/name.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct NamePublishResponse { pub name: String, @@ -14,7 +14,7 @@ pub struct NamePublishResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct NameResolveResponse { pub path: String, diff --git a/ipfs-api/src/response/object.rs b/ipfs-api/src/response/object.rs index de5923c..b002d4b 100644 --- a/ipfs-api/src/response/object.rs +++ b/ipfs-api/src/response/object.rs @@ -13,7 +13,7 @@ use std::collections::HashMap; pub type ObjectDataResponse = Vec; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiff { #[serde(rename = "Type")] @@ -29,7 +29,7 @@ pub struct ObjectDiff { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiffResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -37,7 +37,7 @@ pub struct ObjectDiffResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectGetResponse { pub data: String, @@ -47,7 +47,7 @@ pub struct ObjectGetResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectLinksResponse { pub hash: String, @@ -57,7 +57,7 @@ pub struct ObjectLinksResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectNewResponse { pub hash: String, @@ -67,7 +67,7 @@ pub struct ObjectNewResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAddLinkResponse { pub hash: String, @@ -77,7 +77,7 @@ pub struct ObjectPatchAddLinkResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAppendDataResponse { pub hash: String, @@ -87,7 +87,7 @@ pub struct ObjectPatchAppendDataResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchRmLinkResponse { pub hash: String, @@ -97,7 +97,7 @@ pub struct ObjectPatchRmLinkResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchSetDataResponse { pub hash: String, @@ -107,7 +107,7 @@ pub struct ObjectPatchSetDataResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectPutResponse { pub hash: String, @@ -117,7 +117,7 @@ pub struct ObjectPutResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ObjectStatResponse { pub hash: String, diff --git a/ipfs-api/src/response/pin.rs b/ipfs-api/src/response/pin.rs index 2b8b4ef..a072230 100644 --- a/ipfs-api/src/response/pin.rs +++ b/ipfs-api/src/response/pin.rs @@ -9,8 +9,7 @@ use response::serde; use std::collections::HashMap; - -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PinAddResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -20,7 +19,7 @@ pub struct PinAddResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PinType { #[serde(rename = "Type")] @@ -29,7 +28,7 @@ pub struct PinType { -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct PinLsResponse { #[serde(deserialize_with = "serde::deserialize_hashmap")] @@ -37,7 +36,7 @@ pub struct PinLsResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PinRmResponse { #[serde(deserialize_with = "serde::deserialize_vec")] diff --git a/ipfs-api/src/response/ping.rs b/ipfs-api/src/response/ping.rs index 165ed39..ff48a99 100644 --- a/ipfs-api/src/response/ping.rs +++ b/ipfs-api/src/response/ping.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PingResponse { pub success: bool, diff --git a/ipfs-api/src/response/pubsub.rs b/ipfs-api/src/response/pubsub.rs index e35b30f..b4af8b4 100644 --- a/ipfs-api/src/response/pubsub.rs +++ b/ipfs-api/src/response/pubsub.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PubsubLsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,18 +17,17 @@ pub struct PubsubLsResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct PubsubPeersResponse { #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } - pub type PubsubPubResponse = (); -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] pub struct PubsubSubResponse { pub from: Option, pub data: Option, diff --git a/ipfs-api/src/response/refs.rs b/ipfs-api/src/response/refs.rs index 457a9f7..be69b3d 100644 --- a/ipfs-api/src/response/refs.rs +++ b/ipfs-api/src/response/refs.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct RefsLocalResponse { #[serde(rename = "Ref")] diff --git a/ipfs-api/src/response/repo.rs b/ipfs-api/src/response/repo.rs index fb82936..556a784 100644 --- a/ipfs-api/src/response/repo.rs +++ b/ipfs-api/src/response/repo.rs @@ -10,14 +10,14 @@ use response::serde; use std::collections::HashMap; -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct RepoFsckResponse { pub message: String, } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] #[serde(rename_all = "PascalCase")] pub struct RepoGcResponse { #[serde(deserialize_with = "serde::deserialize_hashmap")] @@ -26,7 +26,7 @@ pub struct RepoGcResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct RepoStatResponse { pub num_objects: u64, @@ -37,7 +37,7 @@ pub struct RepoStatResponse { // Defined in go-ipfs:master core/commands/repo.go -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct RepoVerifyResponse { pub message: String, @@ -46,7 +46,7 @@ pub struct RepoVerifyResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct RepoVersionResponse { pub version: String, diff --git a/ipfs-api/src/response/resolve.rs b/ipfs-api/src/response/resolve.rs index 6f78205..d61738b 100644 --- a/ipfs-api/src/response/resolve.rs +++ b/ipfs-api/src/response/resolve.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct ResolveResponse { pub path: String, diff --git a/ipfs-api/src/response/stats.rs b/ipfs-api/src/response/stats.rs index 931f6e5..894d7f2 100644 --- a/ipfs-api/src/response/stats.rs +++ b/ipfs-api/src/response/stats.rs @@ -12,7 +12,7 @@ use response::{BitswapStatResponse, RepoStatResponse}; pub type StatsBitswapResponse = BitswapStatResponse; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Copy, Clone, PartialEq)] #[serde(rename_all = "PascalCase")] pub struct StatsBwResponse { pub total_in: u64, diff --git a/ipfs-api/src/response/swarm.rs b/ipfs-api/src/response/swarm.rs index 5bdc8da..83ea649 100644 --- a/ipfs-api/src/response/swarm.rs +++ b/ipfs-api/src/response/swarm.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsLocalResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,7 +17,7 @@ pub struct SwarmAddrsLocalResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsConnectResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -25,7 +25,7 @@ pub struct SwarmAddrsConnectResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsDisconnectResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -33,7 +33,7 @@ pub struct SwarmAddrsDisconnectResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersAddResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -41,7 +41,7 @@ pub struct SwarmFiltersAddResponse { } -#[derive(Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersRmResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -49,14 +49,14 @@ pub struct SwarmFiltersRmResponse { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeerStream { pub protocol: String, } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeer { pub addr: String, @@ -69,7 +69,7 @@ pub struct SwarmPeer { } -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeersResponse { #[serde(deserialize_with = "serde::deserialize_vec")] diff --git a/ipfs-api/src/response/tar.rs b/ipfs-api/src/response/tar.rs index bb78d37..23a2a96 100644 --- a/ipfs-api/src/response/tar.rs +++ b/ipfs-api/src/response/tar.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct TarAddResponse { pub name: String, diff --git a/ipfs-api/src/response/version.rs b/ipfs-api/src/response/version.rs index 9f6b5f2..8c2f7e8 100644 --- a/ipfs-api/src/response/version.rs +++ b/ipfs-api/src/response/version.rs @@ -6,7 +6,7 @@ // copied, modified, or distributed except according to those terms. // -#[derive(Debug, Deserialize)] +#[derive(Debug, Deserialize, Clone, PartialEq, Eq, Hash)] #[serde(rename_all = "PascalCase")] pub struct VersionResponse { pub version: String, -- 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/client.rs | 2 +- ipfs-api/src/request/add.rs | 5 +---- ipfs-api/src/request/bitswap.rs | 20 ++++------------- ipfs-api/src/request/block.rs | 20 ++++------------- ipfs-api/src/request/bootstrap.rs | 15 +++---------- ipfs-api/src/request/cat.rs | 5 +---- ipfs-api/src/request/commands.rs | 5 +---- ipfs-api/src/request/config.rs | 15 +++---------- ipfs-api/src/request/dag.rs | 10 ++------- ipfs-api/src/request/dht.rs | 30 ++++++-------------------- ipfs-api/src/request/diag.rs | 15 +++---------- ipfs-api/src/request/dns.rs | 5 +---- ipfs-api/src/request/file.rs | 5 +---- ipfs-api/src/request/files.rs | 45 ++++++++------------------------------- ipfs-api/src/request/filestore.rs | 15 +++---------- ipfs-api/src/request/get.rs | 5 +---- ipfs-api/src/request/id.rs | 5 +---- ipfs-api/src/request/key.rs | 10 ++------- ipfs-api/src/request/log.rs | 15 +++---------- ipfs-api/src/request/ls.rs | 5 +---- ipfs-api/src/request/mod.rs | 2 +- ipfs-api/src/request/object.rs | 20 ++++------------- ipfs-api/src/request/pin.rs | 15 +++---------- ipfs-api/src/request/ping.rs | 5 +---- ipfs-api/src/request/pubsub.rs | 20 ++++------------- ipfs-api/src/request/refs.rs | 5 +---- ipfs-api/src/request/stats.rs | 15 +++---------- ipfs-api/src/request/swarm.rs | 10 ++------- ipfs-api/src/request/tar.rs | 10 ++------- ipfs-api/src/request/version.rs | 5 +---- 30 files changed, 73 insertions(+), 286 deletions(-) diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs index 24a78b3..4d6ceab 100644 --- a/ipfs-api/src/client.rs +++ b/ipfs-api/src/client.rs @@ -84,7 +84,7 @@ impl IpfsClient { let url = format!( "{}{}?{}", self.base, - Req::path(), + Req::path, ::serde_urlencoded::to_string(req)? ); diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs index 5f03db5..cc4019c 100644 --- a/ipfs-api/src/request/add.rs +++ b/ipfs-api/src/request/add.rs @@ -14,8 +14,5 @@ pub struct Add; impl_skip_serialize!(Add); impl ApiRequest for Add { - #[inline] - fn path() -> &'static str { - "/add" - } + const path: &'static str = "/add"; } diff --git a/ipfs-api/src/request/bitswap.rs b/ipfs-api/src/request/bitswap.rs index 4ada208..6e711f8 100644 --- a/ipfs-api/src/request/bitswap.rs +++ b/ipfs-api/src/request/bitswap.rs @@ -16,10 +16,7 @@ pub struct BitswapLedger<'a> { } impl<'a> ApiRequest for BitswapLedger<'a> { - #[inline] - fn path() -> &'static str { - "/bitswap/ledger" - } + const path: &'static str = "/bitswap/ledger"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -28,10 +25,7 @@ pub struct BitswapStat; impl_skip_serialize!(BitswapStat); impl ApiRequest for BitswapStat { - #[inline] - fn path() -> &'static str { - "/bitswap/stat" - } + const path: &'static str = "/bitswap/stat"; } @@ -42,10 +36,7 @@ pub struct BitswapUnwant<'a> { } impl<'a> ApiRequest for BitswapUnwant<'a> { - #[inline] - fn path() -> &'static str { - "/bitswap/stat" - } + const path: &'static str = "/bitswap/stat"; } @@ -55,8 +46,5 @@ pub struct BitswapWantlist<'a> { } impl<'a> ApiRequest for BitswapWantlist<'a> { - #[inline] - fn path() -> &'static str { - "/bitswap/wantlist" - } + const path: &'static str = "/bitswap/wantlist"; } diff --git a/ipfs-api/src/request/block.rs b/ipfs-api/src/request/block.rs index 02583fe..799f2f4 100644 --- a/ipfs-api/src/request/block.rs +++ b/ipfs-api/src/request/block.rs @@ -16,10 +16,7 @@ pub struct BlockGet<'a> { } impl<'a> ApiRequest for BlockGet<'a> { - #[inline] - fn path() -> &'static str { - "/block/get" - } + const path: &'static str = "/block/get"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -28,10 +25,7 @@ pub struct BlockPut; impl_skip_serialize!(BlockPut); impl ApiRequest for BlockPut { - #[inline] - fn path() -> &'static str { - "/block/put" - } + const path: &'static str = "/block/put"; } @@ -42,10 +36,7 @@ pub struct BlockRm<'a> { } impl<'a> ApiRequest for BlockRm<'a> { - #[inline] - fn path() -> &'static str { - "/block/rm" - } + const path: &'static str = "/block/rm"; } @@ -56,8 +47,5 @@ pub struct BlockStat<'a> { } impl<'a> ApiRequest for BlockStat<'a> { - #[inline] - fn path() -> &'static str { - "/block/stat" - } + const path: &'static str = "/block/stat"; } diff --git a/ipfs-api/src/request/bootstrap.rs b/ipfs-api/src/request/bootstrap.rs index adbfd19..9ffd482 100644 --- a/ipfs-api/src/request/bootstrap.rs +++ b/ipfs-api/src/request/bootstrap.rs @@ -14,10 +14,7 @@ pub struct BootstrapAddDefault; impl_skip_serialize!(BootstrapAddDefault); impl ApiRequest for BootstrapAddDefault { - #[inline] - fn path() -> &'static str { - "/bootstrap/add/default" - } + const path: &'static str = "/bootstrap/add/default"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -26,10 +23,7 @@ pub struct BootstrapList; impl_skip_serialize!(BootstrapList); impl ApiRequest for BootstrapList { - #[inline] - fn path() -> &'static str { - "/bootstrap/list" - } + const path: &'static str = "/bootstrap/list"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -38,8 +32,5 @@ pub struct BootstrapRmAll; impl_skip_serialize!(BootstrapRmAll); impl ApiRequest for BootstrapRmAll { - #[inline] - fn path() -> &'static str { - "/bootstrap/rm/all" - } + const path: &'static str = "/bootstrap/rm/all"; } diff --git a/ipfs-api/src/request/cat.rs b/ipfs-api/src/request/cat.rs index d14a6e8..5bae654 100644 --- a/ipfs-api/src/request/cat.rs +++ b/ipfs-api/src/request/cat.rs @@ -16,8 +16,5 @@ pub struct Cat<'a> { } impl<'a> ApiRequest for Cat<'a> { - #[inline] - fn path() -> &'static str { - "/cat" - } + const path: &'static str = "/cat"; } diff --git a/ipfs-api/src/request/commands.rs b/ipfs-api/src/request/commands.rs index 609a2cd..8efb683 100644 --- a/ipfs-api/src/request/commands.rs +++ b/ipfs-api/src/request/commands.rs @@ -14,8 +14,5 @@ pub struct Commands; impl_skip_serialize!(Commands); impl ApiRequest for Commands { - #[inline] - fn path() -> &'static str { - "/commands" - } + const path: &'static str = "/commands"; } diff --git a/ipfs-api/src/request/config.rs b/ipfs-api/src/request/config.rs index b70d981..600db3a 100644 --- a/ipfs-api/src/request/config.rs +++ b/ipfs-api/src/request/config.rs @@ -14,10 +14,7 @@ pub struct ConfigEdit; impl_skip_serialize!(ConfigEdit); impl ApiRequest for ConfigEdit { - #[inline] - fn path() -> &'static str { - "/config/edit" - } + const path: &'static str = "/config/edit"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -26,10 +23,7 @@ pub struct ConfigReplace; impl_skip_serialize!(ConfigReplace); impl ApiRequest for ConfigReplace { - #[inline] - fn path() -> &'static str { - "/config/replace" - } + const path: &'static str = "/config/replace"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -38,8 +32,5 @@ pub struct ConfigShow; impl_skip_serialize!(ConfigShow); impl ApiRequest for ConfigShow { - #[inline] - fn path() -> &'static str { - "/config/show" - } + const path: &'static str = "/config/show"; } diff --git a/ipfs-api/src/request/dag.rs b/ipfs-api/src/request/dag.rs index a3a64a9..b2d03ff 100644 --- a/ipfs-api/src/request/dag.rs +++ b/ipfs-api/src/request/dag.rs @@ -16,10 +16,7 @@ pub struct DagGet<'a> { } impl<'a> ApiRequest for DagGet<'a> { - #[inline] - fn path() -> &'static str { - "/dag/get" - } + const path: &'static str = "/dag/get"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -28,8 +25,5 @@ pub struct DagPut; impl_skip_serialize!(DagPut); impl ApiRequest for DagPut { - #[inline] - fn path() -> &'static str { - "/dag/put" - } + const path: &'static str = "/dag/put"; } diff --git a/ipfs-api/src/request/dht.rs b/ipfs-api/src/request/dht.rs index 9677215..ec3239a 100644 --- a/ipfs-api/src/request/dht.rs +++ b/ipfs-api/src/request/dht.rs @@ -16,10 +16,7 @@ pub struct DhtFindPeer<'a> { } impl<'a> ApiRequest for DhtFindPeer<'a> { - #[inline] - fn path() -> &'static str { - "/dht/findpeer" - } + const path: &'static str = "/dht/findpeer"; } @@ -30,10 +27,7 @@ pub struct DhtFindProvs<'a> { } impl<'a> ApiRequest for DhtFindProvs<'a> { - #[inline] - fn path() -> &'static str { - "/dht/findprovs" - } + const path: &'static str = "/dht/findprovs"; } @@ -44,10 +38,7 @@ pub struct DhtGet<'a> { } impl<'a> ApiRequest for DhtGet<'a> { - #[inline] - fn path() -> &'static str { - "/dht/get" - } + const path: &'static str = "/dht/get"; } @@ -58,10 +49,7 @@ pub struct DhtProvide<'a> { } impl<'a> ApiRequest for DhtProvide<'a> { - #[inline] - fn path() -> &'static str { - "/dht/provide" - } + const path: &'static str = "/dht/provide"; } @@ -75,10 +63,7 @@ pub struct DhtPut<'a> { } impl<'a> ApiRequest for DhtPut<'a> { - #[inline] - fn path() -> &'static str { - "/dht/put" - } + const path: &'static str = "/dht/put"; } @@ -89,8 +74,5 @@ pub struct DhtQuery<'a> { } impl<'a> ApiRequest for DhtQuery<'a> { - #[inline] - fn path() -> &'static str { - "/dht/query" - } + const path: &'static str = "/dht/query"; } diff --git a/ipfs-api/src/request/diag.rs b/ipfs-api/src/request/diag.rs index 2045e83..1ccbdf1 100644 --- a/ipfs-api/src/request/diag.rs +++ b/ipfs-api/src/request/diag.rs @@ -14,10 +14,7 @@ pub struct DiagCmdsClear; impl_skip_serialize!(DiagCmdsClear); impl ApiRequest for DiagCmdsClear { - #[inline] - fn path() -> &'static str { - "/diag/cmds/clear" - } + const path: &'static str = "/diag/cmds/clear"; } @@ -28,10 +25,7 @@ pub struct DiagCmdsSetTime<'a> { } impl<'a> ApiRequest for DiagCmdsSetTime<'a> { - #[inline] - fn path() -> &'static str { - "/diag/cmds/set-time" - } + const path: &'static str = "/diag/cmds/set-time"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -40,8 +34,5 @@ pub struct DiagSys; impl_skip_serialize!(DiagSys); impl ApiRequest for DiagSys { - #[inline] - fn path() -> &'static str { - "/diag/sys" - } + const path: &'static str = "/diag/sys"; } diff --git a/ipfs-api/src/request/dns.rs b/ipfs-api/src/request/dns.rs index b9666b3..178bf36 100644 --- a/ipfs-api/src/request/dns.rs +++ b/ipfs-api/src/request/dns.rs @@ -18,8 +18,5 @@ pub struct Dns<'a> { } impl<'a> ApiRequest for Dns<'a> { - #[inline] - fn path() -> &'static str { - "/dns" - } + const path: &'static str = "/dns"; } diff --git a/ipfs-api/src/request/file.rs b/ipfs-api/src/request/file.rs index b0c0bc2..8febb51 100644 --- a/ipfs-api/src/request/file.rs +++ b/ipfs-api/src/request/file.rs @@ -16,8 +16,5 @@ pub struct FileLs<'a> { } impl<'a> ApiRequest for FileLs<'a> { - #[inline] - fn path() -> &'static str { - "/file/ls" - } + const path: &'static str = "/file/ls"; } diff --git a/ipfs-api/src/request/files.rs b/ipfs-api/src/request/files.rs index a986ebe..67f976d 100644 --- a/ipfs-api/src/request/files.rs +++ b/ipfs-api/src/request/files.rs @@ -19,10 +19,7 @@ pub struct FilesCp<'a> { } impl<'a> ApiRequest for FilesCp<'a> { - #[inline] - fn path() -> &'static str { - "/files/cp" - } + const path: &'static str = "/files/cp"; } @@ -33,10 +30,7 @@ pub struct FilesFlush<'a> { } impl<'a> ApiRequest for FilesFlush<'a> { - #[inline] - fn path() -> &'static str { - "/files/flush" - } + const path: &'static str = "/files/flush"; } @@ -47,10 +41,7 @@ pub struct FilesLs<'a> { } impl<'a> ApiRequest for FilesLs<'a> { - #[inline] - fn path() -> &'static str { - "/files/ls" - } + const path: &'static str = "/files/ls"; } @@ -63,10 +54,7 @@ pub struct FilesMkdir<'a> { } impl<'a> ApiRequest for FilesMkdir<'a> { - #[inline] - fn path() -> &'static str { - "/files/mkdir" - } + const path: &'static str = "/files/mkdir"; } @@ -80,10 +68,7 @@ pub struct FilesMv<'a> { } impl<'a> ApiRequest for FilesMv<'a> { - #[inline] - fn path() -> &'static str { - "/files/mv" - } + const path: &'static str = "/files/mv"; } @@ -94,10 +79,7 @@ pub struct FilesRead<'a> { } impl<'a> ApiRequest for FilesRead<'a> { - #[inline] - fn path() -> &'static str { - "/files/read" - } + const path: &'static str = "/files/read"; } @@ -110,10 +92,7 @@ pub struct FilesRm<'a> { } impl<'a> ApiRequest for FilesRm<'a> { - #[inline] - fn path() -> &'static str { - "/files/rm" - } + const path: &'static str = "/files/rm"; } @@ -124,10 +103,7 @@ pub struct FilesStat<'a> { } impl<'a> ApiRequest for FilesStat<'a> { - #[inline] - fn path() -> &'static str { - "/files/stat" - } + const path: &'static str = "/files/stat"; } @@ -142,8 +118,5 @@ pub struct FilesWrite<'a> { } impl<'a> ApiRequest for FilesWrite<'a> { - #[inline] - fn path() -> &'static str { - "/files/write" - } + const path: &'static str = "/files/write"; } diff --git a/ipfs-api/src/request/filestore.rs b/ipfs-api/src/request/filestore.rs index 4ad57e0..2d9047b 100644 --- a/ipfs-api/src/request/filestore.rs +++ b/ipfs-api/src/request/filestore.rs @@ -14,10 +14,7 @@ pub struct FilestoreDups; impl_skip_serialize!(FilestoreDups); impl ApiRequest for FilestoreDups { - #[inline] - fn path() -> &'static str { - "/filestore/dups" - } + const path: &'static str = "/filestore/dups"; } @@ -28,10 +25,7 @@ pub struct FilestoreLs<'a> { } impl<'a> ApiRequest for FilestoreLs<'a> { - #[inline] - fn path() -> &'static str { - "/filestore/ls" - } + const path: &'static str = "/filestore/ls"; } @@ -42,8 +36,5 @@ pub struct FilestoreVerify<'a> { } impl<'a> ApiRequest for FilestoreVerify<'a> { - #[inline] - fn path() -> &'static str { - "/filestore/verify" - } + const path: &'static str = "/filestore/verify"; } diff --git a/ipfs-api/src/request/get.rs b/ipfs-api/src/request/get.rs index 87a414f..1f5e2e0 100644 --- a/ipfs-api/src/request/get.rs +++ b/ipfs-api/src/request/get.rs @@ -16,8 +16,5 @@ pub struct Get<'a> { } impl<'a> ApiRequest for Get<'a> { - #[inline] - fn path() -> &'static str { - "/get" - } + const path: &'static str = "/get"; } diff --git a/ipfs-api/src/request/id.rs b/ipfs-api/src/request/id.rs index 8b4ed39..9648787 100644 --- a/ipfs-api/src/request/id.rs +++ b/ipfs-api/src/request/id.rs @@ -16,8 +16,5 @@ pub struct Id<'a> { } impl<'a> ApiRequest for Id<'a> { - #[inline] - fn path() -> &'static str { - "/id" - } + const path: &'static str = "/id"; } diff --git a/ipfs-api/src/request/key.rs b/ipfs-api/src/request/key.rs index fa27e11..821fd0a 100644 --- a/ipfs-api/src/request/key.rs +++ b/ipfs-api/src/request/key.rs @@ -43,10 +43,7 @@ pub struct KeyGen<'a, 'b> { } impl<'a, 'b> ApiRequest for KeyGen<'a, 'b> { - #[inline] - fn path() -> &'static str { - "/key/gen" - } + const path: &'static str = "/key/gen"; } #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] @@ -55,8 +52,5 @@ pub struct KeyList; impl_skip_serialize!(KeyList); impl ApiRequest for KeyList { - #[inline] - fn path() -> &'static str { - "/key/list" - } + const path: &'static str = "/key/list"; } diff --git a/ipfs-api/src/request/log.rs b/ipfs-api/src/request/log.rs index 5f22a40..ed90ec8 100644 --- a/ipfs-api/src/request/log.rs +++ b/ipfs-api/src/request/log.rs @@ -68,10 +68,7 @@ pub struct LogLevel<'a> { } impl<'a> ApiRequest for LogLevel<'a> { - #[inline] - fn path() -> &'static str { - "/log/level" - } + const path: &'static str = "/log/level"; } @@ -81,10 +78,7 @@ pub struct LogLs; impl_skip_serialize!(LogLs); impl ApiRequest for LogLs { - #[inline] - fn path() -> &'static str { - "/log/ls" - } + const path: &'static str = "/log/ls"; } @@ -94,8 +88,5 @@ pub struct LogTail; impl_skip_serialize!(LogTail); impl ApiRequest for LogTail { - #[inline] - fn path() -> &'static str { - "/log/tail" - } + const path: &'static str = "/log/tail"; } diff --git a/ipfs-api/src/request/ls.rs b/ipfs-api/src/request/ls.rs index a6c66ba..54bce37 100644 --- a/ipfs-api/src/request/ls.rs +++ b/ipfs-api/src/request/ls.rs @@ -16,10 +16,7 @@ pub struct Ls<'a> { } impl<'a> ApiRequest for Ls<'a> { - #[inline] - fn path() -> &'static str { - "/ls" - } + const path: &'static str = "/ls"; } diff --git a/ipfs-api/src/request/mod.rs b/ipfs-api/src/request/mod.rs index cbee846..4030047 100644 --- a/ipfs-api/src/request/mod.rs +++ b/ipfs-api/src/request/mod.rs @@ -107,5 +107,5 @@ pub trait ApiRequest { /// /// All paths should begin with '/'. /// - fn path() -> &'static str; + const path: &'static str; } diff --git a/ipfs-api/src/request/object.rs b/ipfs-api/src/request/object.rs index 97bdfad..616a9aa 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -19,10 +19,7 @@ pub struct ObjectDiff<'a> { } impl<'a> ApiRequest for ObjectDiff<'a> { - #[inline] - fn path() -> &'static str { - "/object/diff" - } + const path: &'static str = "/object/diff"; } @@ -33,10 +30,7 @@ pub struct ObjectGet<'a> { } impl<'a> ApiRequest for ObjectGet<'a> { - #[inline] - fn path() -> &'static str { - "/object/get" - } + const path: &'static str = "/object/get"; } @@ -47,10 +41,7 @@ pub struct ObjectLinks<'a> { } impl<'a> ApiRequest for ObjectLinks<'a> { - #[inline] - fn path() -> &'static str { - "/object/links" - } + const path: &'static str = "/object/links"; } @@ -61,10 +52,7 @@ pub struct ObjectStat<'a> { } impl<'a> ApiRequest for ObjectStat<'a> { - #[inline] - fn path() -> &'static str { - "/object/stat" - } + const path: &'static str = "/object/stat"; } diff --git a/ipfs-api/src/request/pin.rs b/ipfs-api/src/request/pin.rs index 0d06bbe..f9ac6ef 100644 --- a/ipfs-api/src/request/pin.rs +++ b/ipfs-api/src/request/pin.rs @@ -18,10 +18,7 @@ pub struct PinAdd<'a> { } impl<'a> ApiRequest for PinAdd<'a> { - #[inline] - fn path() -> &'static str { - "/pin/add" - } + const path: &'static str = "/pin/add"; } @@ -35,10 +32,7 @@ pub struct PinLs<'a> { } impl<'a> ApiRequest for PinLs<'a> { - #[inline] - fn path() -> &'static str { - "/pin/ls" - } + const path: &'static str = "/pin/ls"; } @@ -51,8 +45,5 @@ pub struct PinRm<'a> { } impl<'a> ApiRequest for PinRm<'a> { - #[inline] - fn path() -> &'static str { - "/pin/rm" - } + const path: &'static str = "/pin/rm"; } diff --git a/ipfs-api/src/request/ping.rs b/ipfs-api/src/request/ping.rs index 601a463..201b3cd 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -17,8 +17,5 @@ pub struct Ping<'a, 'b> { } impl<'a, 'b> ApiRequest for Ping<'a, 'b> { - #[inline] - fn path() -> &'static str { - "/ping" - } + const path: &'static str = "/ping"; } diff --git a/ipfs-api/src/request/pubsub.rs b/ipfs-api/src/request/pubsub.rs index d089c2a..fbf5c33 100644 --- a/ipfs-api/src/request/pubsub.rs +++ b/ipfs-api/src/request/pubsub.rs @@ -14,10 +14,7 @@ pub struct PubsubLs; impl_skip_serialize!(PubsubLs); impl ApiRequest for PubsubLs { - #[inline] - fn pa