diff options
author | Simon Heath <icefoxen@gmail.com> | 2017-12-11 12:45:07 -0500 |
---|---|---|
committer | Simon Heath <icefoxen@gmail.com> | 2017-12-11 12:45:07 -0500 |
commit | fc77980617d9ef179ecb1773f3d901f52790cfad (patch) | |
tree | 09575ccc3c80827881305e3e315e260aee57d53c | |
parent | fac1b03d287a61f6679856e954aa59c5cbf1dbca (diff) |
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.
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> { } -#[der |