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/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, 143 insertions(+), 141 deletions(-) diff --git a/ipfs-api/src/request/add.rs b/ipfs-api/src/request/add.rs index f669864..037e57a 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 b5a2e16..45230cb 100644 --- a/ipfs-api/src/request/bitswap.rs +++ b/ipfs-api/src/request/bitswap.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct BitswapLedger<'a> { #[serde(rename = "arg")] pub peer: &'a str, @@ -19,7 +19,7 @@ impl<'a> ApiRequest for BitswapLedger<'a> { const PATH: &'static str = "/bitswap/ledger"; } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub struct BitswapStat; impl_skip_serialize!(BitswapStat); @@ -29,7 +29,7 @@ impl ApiRequest for BitswapStat { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct BitswapUnwant<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -40,7 +40,7 @@ impl<'a> ApiRequest for BitswapUnwant<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 5729317..b525109 100644 --- a/ipfs-api/src/request/block.rs +++ b/ipfs-api/src/request/block.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct BlockGet<'a> { #[serde(rename = "arg")] pub hash: &'a str, @@ -19,7 +19,7 @@ impl<'a> ApiRequest for BlockGet<'a> { const PATH: &'static str = "/block/get"; } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub struct BlockPut; impl_skip_serialize!(BlockPut); @@ -29,7 +29,7 @@ impl ApiRequest for BlockPut { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct BlockRm<'a> { #[serde(rename = "arg")] pub hash: &'a str, @@ -40,7 +40,7 @@ impl<'a> ApiRequest for BlockRm<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 def3664..c60072a 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); @@ -17,7 +17,7 @@ impl ApiRequest for BootstrapAddDefault { const PATH: &'static str = "/bootstrap/add/default"; } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub struct BootstrapList; impl_skip_serialize!(BootstrapList); @@ -26,7 +26,7 @@ impl ApiRequest for BootstrapList { const PATH: &'static str = "/bootstrap/list"; } -#[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 e288f7f..6b958d4 100644 --- a/ipfs-api/src/request/cat.rs +++ b/ipfs-api/src/request/cat.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 132959e..8dcfdee 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 2af3159..13e0670 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); @@ -17,7 +17,7 @@ impl ApiRequest for ConfigEdit { const PATH: &'static str = "/config/edit"; } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub struct ConfigReplace; impl_skip_serialize!(ConfigReplace); @@ -26,7 +26,7 @@ impl ApiRequest for ConfigReplace { const PATH: &'static str = "/config/replace"; } -#[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 4b17b82..cc5cf08 100644 --- a/ipfs-api/src/request/dag.rs +++ b/ipfs-api/src/request/dag.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DagGet<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -19,7 +19,7 @@ impl<'a> ApiRequest for DagGet<'a> { const PATH: &'static str = "/dag/get"; } -#[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 7630df3..dfafbc4 100644 --- a/ipfs-api/src/request/dht.rs +++ b/ipfs-api/src/request/dht.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DhtFindPeer<'a> { #[serde(rename = "arg")] pub peer: &'a str, @@ -20,7 +20,7 @@ impl<'a> ApiRequest for DhtFindPeer<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DhtFindProvs<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -31,7 +31,7 @@ impl<'a> ApiRequest for DhtFindProvs<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DhtGet<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -42,7 +42,7 @@ impl<'a> ApiRequest for DhtGet<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DhtProvide<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -53,7 +53,7 @@ impl<'a> ApiRequest for DhtProvide<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DhtPut<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -67,7 +67,7 @@ impl<'a> ApiRequest for DhtPut<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 5ef9108..2091e0d 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); @@ -18,7 +18,7 @@ impl ApiRequest for DiagCmdsClear { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct DiagCmdsSetTime<'a> { #[serde(rename = "arg")] pub time: &'a str, @@ -28,7 +28,7 @@ impl<'a> ApiRequest for DiagCmdsSetTime<'a> { const PATH: &'static str = "/diag/cmds/set-time"; } -#[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 a168967..8657e7d 100644 --- a/ipfs-api/src/request/dns.rs +++ b/ipfs-api/src/request/dns.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 57de125..ff995fc 100644 --- a/ipfs-api/src/request/file.rs +++ b/ipfs-api/src/request/file.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 4f7d51f..cbe07d7 100644 --- a/ipfs-api/src/request/files.rs +++ b/ipfs-api/src/request/files.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesCp<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -23,7 +23,7 @@ impl<'a> ApiRequest for FilesCp<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesFlush<'a> { #[serde(rename = "arg")] pub path: &'a Option<&'a str>, @@ -34,7 +34,7 @@ impl<'a> ApiRequest for FilesFlush<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesLs<'a> { #[serde(rename = "arg")] pub path: &'a Option<&'a str>, @@ -45,7 +45,7 @@ impl<'a> ApiRequest for FilesLs<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesMkdir<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -58,7 +58,7 @@ impl<'a> ApiRequest for FilesMkdir<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesMv<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -72,7 +72,7 @@ impl<'a> ApiRequest for FilesMv<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesRead<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -83,7 +83,7 @@ impl<'a> ApiRequest for FilesRead<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesRm<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -96,7 +96,7 @@ impl<'a> ApiRequest for FilesRm<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilesStat<'a> { #[serde(rename = "arg")] pub path: &'a str, @@ -107,7 +107,7 @@ impl<'a> ApiRequest for FilesStat<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 d6b4530..082b999 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); @@ -18,7 +18,7 @@ impl ApiRequest for FilestoreDups { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct FilestoreLs<'a> { #[serde(rename = "arg")] pub cid: &'a Option<&'a str>, @@ -29,7 +29,7 @@ impl<'a> ApiRequest for FilestoreLs<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 8c1b3c9..959e70a 100644 --- a/ipfs-api/src/request/get.rs +++ b/ipfs-api/src/request/get.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 f7fb1c6..144a9ed 100644 --- a/ipfs-api/src/request/id.rs +++ b/ipfs-api/src/request/id.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 98601df..e656f60 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(Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Copy, Clone)] pub enum KeyType { Rsa, Ed25519, @@ -31,7 +31,7 @@ impl Serialize for KeyType { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct KeyGen<'a, 'b> { #[serde(rename = "arg")] pub name: &'a str, @@ -46,7 +46,7 @@ impl<'a, 'b> ApiRequest for KeyGen<'a, 'b> { const PATH: &'static str = "/key/gen"; } -#[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 c2b8c73..04746c1 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, Debug, PartialEq, Eq, Hash)] +#[derive(Copy, Clone)] 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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct LogLevel<'a> { #[serde(rename = "arg")] pub logger: Logger<'a>, @@ -72,7 +72,6 @@ impl<'a> ApiRequest for LogLevel<'a> { } -#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] pub struct LogLs; impl_skip_serialize!(LogLs); @@ -82,7 +81,6 @@ 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 a68dedd..90ebd30 100644 --- a/ipfs-api/src/request/ls.rs +++ b/ipfs-api/src/request/ls.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 604cf4b..3e4da29 100644 --- a/ipfs-api/src/request/object.rs +++ b/ipfs-api/src/request/object.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct ObjectDiff<'a> { #[serde(rename = "arg")] pub key0: &'a str, @@ -23,7 +23,7 @@ impl<'a> ApiRequest for ObjectDiff<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct ObjectGet<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -34,7 +34,7 @@ impl<'a> ApiRequest for ObjectGet<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct ObjectLinks<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -45,7 +45,7 @@ impl<'a> ApiRequest for ObjectLinks<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 d48f6a6..362453f 100644 --- a/ipfs-api/src/request/pin.rs +++ b/ipfs-api/src/request/pin.rs @@ -9,7 +9,7 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct PinAdd<'a> { #[serde(rename = "arg")] pub key: &'a str, @@ -22,7 +22,7 @@ impl<'a> ApiRequest for PinAdd<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct PinLs<'a> { #[serde(rename = "arg")] pub key: &'a Option<&'a str>, @@ -36,7 +36,7 @@ impl<'a> ApiRequest for PinLs<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 e4047fc..e5bfd83 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -8,7 +8,8 @@ use request::ApiRequest; -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] + +#[derive(Serialize)] 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 b6a9d2b..41adf28 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); @@ -18,7 +18,7 @@ impl ApiRequest for PubsubLs { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct PubsubPeers<'a> { #[serde(rename = "arg")] pub topic: &'a Option<&'a str>, @@ -29,7 +29,7 @@ impl<'a> ApiRequest for PubsubPeers<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] pub struct PubsubPub<'a> { #[serde(rename = "arg")] pub topic: &'a str, @@ -43,7 +43,7 @@ impl<'a> ApiRequest for PubsubPub<'a> { } -#[derive(Serialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 14ba9dd..484869f 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 f699447..523de0f 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); @@ -17,7 +17,7 @@ impl ApiRequest for StatsBitswap { const PATH: &'static str = "/stats/bitswap"; } -#[derive(Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)] + pub struct StatsBw; impl_skip_serialize!(StatsBw); @@ -26,7 +26,7 @@ impl ApiRequest for StatsBw { const PATH: &'static str = "/stats/bw"; } -#[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 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); diff --git a/ipfs-api/src/request/tar.rs b/ipfs-api/src/request/tar.rs index 86bba3d..c634068 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); @@ -18,7 +18,7 @@ impl ApiRequest for TarAdd { } -#[derive(Serialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Serialize)] 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 4bc89d7..0c21c1c 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 e606f6e..24c82ac 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 5177300..34855e2 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BlockPutResponse { pub key: String, @@ -14,7 +14,7 @@ pub struct BlockPutResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct BlockRmResponse { pub hash: String, @@ -22,7 +22,7 @@ pub struct BlockRmResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 0cf8f6f..bbdeaaa 100644 --- a/ipfs-api/src/response/commands.rs +++ b/ipfs-api/src/response/commands.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct CommandsResponseOptions { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,7 +17,7 @@ pub struct CommandsResponseOptions { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 ae9ae1e..6d5e25b 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(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct DagIpfsHeader { pub name: String, @@ -21,7 +21,7 @@ pub struct DagIpfsHeader { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] pub struct DagGetResponse { pub data: Option, @@ -30,7 +30,7 @@ pub struct DagGetResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 64b909a..69f79d2 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 6222a08..5f67eec 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 d220dcf..7623135 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsDetailedFile { pub hash: String, @@ -24,7 +24,7 @@ pub struct IpfsDetailedFile { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] #[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 fdcd873..1b073de 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilesEntry { pub name: String, @@ -29,7 +29,7 @@ pub struct FilesEntry { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilesLsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -46,7 +46,7 @@ pub type FilesMvResponse = (); pub type FilesRmResponse = (); -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 e766eb7..f2f62e5 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct FilestoreDupsResponse { #[serde(rename = "Ref")] @@ -16,7 +16,7 @@ pub struct FilestoreDupsResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 678a8a4..72a0569 100644 --- a/ipfs-api/src/response/id.rs +++ b/ipfs-api/src/response/id.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 3bbe7c6..2eb7de7 100644 --- a/ipfs-api/src/response/key.rs +++ b/ipfs-api/src/response/key.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct KeyGenResponse { pub name: String, @@ -17,7 +17,7 @@ pub struct KeyGenResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 786cbdf..643d341 100644 --- a/ipfs-api/src/response/log.rs +++ b/ipfs-api/src/response/log.rs @@ -9,14 +9,14 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct LogLevelResponse { pub message: String, } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 b8a7c5a..fa9a26b 100644 --- a/ipfs-api/src/response/ls.rs +++ b/ipfs-api/src/response/ls.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsFile { pub hash: String, @@ -19,7 +19,7 @@ pub struct IpfsFile { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct IpfsFileHeader { pub name: String, @@ -31,7 +31,7 @@ pub struct IpfsFileHeader { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[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 5fe9413..e42c067 100644 --- a/ipfs-api/src/response/mod.rs +++ b/ipfs-api/src/response/mod.rs @@ -92,7 +92,8 @@ mod swarm; mod tar; mod version; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] + +#[derive(Debug, Deserialize)] #[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 c5c9bf9..1479aa3 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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[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 7ca952a..00d8cda 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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct NamePublishResponse { pub name: String, @@ -14,7 +14,7 @@ pub struct NamePublishResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[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 b002d4b..de5923c 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(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiff { #[serde(rename = "Type")] @@ -29,7 +29,7 @@ pub struct ObjectDiff { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectDiffResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -37,7 +37,7 @@ pub struct ObjectDiffResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectGetResponse { pub data: String, @@ -47,7 +47,7 @@ pub struct ObjectGetResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectLinksResponse { pub hash: String, @@ -57,7 +57,7 @@ pub struct ObjectLinksResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectNewResponse { pub hash: String, @@ -67,7 +67,7 @@ pub struct ObjectNewResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAddLinkResponse { pub hash: String, @@ -77,7 +77,7 @@ pub struct ObjectPatchAddLinkResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchAppendDataResponse { pub hash: String, @@ -87,7 +87,7 @@ pub struct ObjectPatchAppendDataResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchRmLinkResponse { pub hash: String, @@ -97,7 +97,7 @@ pub struct ObjectPatchRmLinkResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPatchSetDataResponse { pub hash: String, @@ -107,7 +107,7 @@ pub struct ObjectPatchSetDataResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct ObjectPutResponse { pub hash: String, @@ -117,7 +117,7 @@ pub struct ObjectPutResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 a072230..2b8b4ef 100644 --- a/ipfs-api/src/response/pin.rs +++ b/ipfs-api/src/response/pin.rs @@ -9,7 +9,8 @@ use response::serde; use std::collections::HashMap; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] + +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinAddResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -19,7 +20,7 @@ pub struct PinAddResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinType { #[serde(rename = "Type")] @@ -28,7 +29,7 @@ pub struct PinType { -#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PinLsResponse { #[serde(deserialize_with = "serde::deserialize_hashmap")] @@ -36,7 +37,7 @@ pub struct PinLsResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 ff48a99..165ed39 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 b4af8b4..e35b30f 100644 --- a/ipfs-api/src/response/pubsub.rs +++ b/ipfs-api/src/response/pubsub.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PubsubLsResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,17 +17,18 @@ pub struct PubsubLsResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct PubsubPeersResponse { #[serde(deserialize_with = "serde::deserialize_vec")] pub strings: Vec, } + pub type PubsubPubResponse = (); -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] 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 be69b3d..457a9f7 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 556a784..fb82936 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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoFsckResponse { pub message: String, } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoGcResponse { #[serde(deserialize_with = "serde::deserialize_hashmap")] @@ -26,7 +26,7 @@ pub struct RepoGcResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct RepoVerifyResponse { pub message: String, @@ -46,7 +46,7 @@ pub struct RepoVerifyResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[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 d61738b..6f78205 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, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[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 894d7f2..931f6e5 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(Deserialize, Debug, Copy, Clone, PartialEq)] +#[derive(Debug, Deserialize)] #[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 83ea649..5bdc8da 100644 --- a/ipfs-api/src/response/swarm.rs +++ b/ipfs-api/src/response/swarm.rs @@ -9,7 +9,7 @@ use response::serde; -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsLocalResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -17,7 +17,7 @@ pub struct SwarmAddrsLocalResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsConnectResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -25,7 +25,7 @@ pub struct SwarmAddrsConnectResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmAddrsDisconnectResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -33,7 +33,7 @@ pub struct SwarmAddrsDisconnectResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersAddResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -41,7 +41,7 @@ pub struct SwarmFiltersAddResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmFiltersRmResponse { #[serde(deserialize_with = "serde::deserialize_vec")] @@ -49,14 +49,14 @@ pub struct SwarmFiltersRmResponse { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeerStream { pub protocol: String, } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct SwarmPeer { pub addr: String, @@ -69,7 +69,7 @@ pub struct SwarmPeer { } -#[derive(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 23a2a96..bb78d37 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(Deserialize, Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[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 8c2f7e8..9f6b5f2 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, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Deserialize)] #[serde(rename_all = "PascalCase")] pub struct VersionResponse { pub version: String, -- cgit v1.2.3