diff options
author | Simon Heath <icefoxen@gmail.com> | 2017-12-13 10:09:15 -0500 |
---|---|---|
committer | Simon Heath <icefoxen@gmail.com> | 2017-12-13 10:09:15 -0500 |
commit | 07e2fa7acaf2b0309263629af4543428c06e771d (patch) | |
tree | 09f476feb5b9fcbdc0d8cf77f3e6f019a08e67f1 | |
parent | 45077f90db50fbcb4d13e94b2ee336bf06222b88 (diff) |
Revert "Add basic derive's to all types"
This reverts commit fc77980617d9ef179ecb1773f3d901f52790cfad.
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> |