diff options
author | Ferris Tseng <ferristseng@gmail.com> | 2017-12-14 10:01:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-14 10:01:54 -0500 |
commit | f2660db63f7580443f6a10fbddf7035aaf9f7f4d (patch) | |
tree | 09f476feb5b9fcbdc0d8cf77f3e6f019a08e67f1 | |
parent | fac1b03d287a61f6679856e954aa59c5cbf1dbca (diff) | |
parent | 07e2fa7acaf2b0309263629af4543428c06e771d (diff) |
Merge pull request #11 from icefoxen/associated-const
Associated consts
30 files changed, 73 insertions, 286 deletions
diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs index 24a78b3..dee4a24 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 31458ea..037e57a 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 0c0953e..45230cb 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"; } @@ -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 8409e0f..b525109 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"; } @@ -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 3ff8bf8..c60072a 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"; } @@ -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"; } @@ -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 ec182e3..6b958d4 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 515ddb5..8dcfdee 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 d018056..13e0670 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"; } @@ -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"; } @@ -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 5e9e237..cc5cf08 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"; } @@ -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 877a69a..dfafbc4 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 315d474..2091e0d 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"; } @@ -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 4ac2000..8657e7d 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 4d8c42f..ff995fc 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 96e4516..cbe07d7 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 93554f9..082b999 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 c33bd4b..959e70a 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 1677fd6..144a9ed 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 771c48d..e656f60 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"; } @@ -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 7a48e5f..04746c1 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"; } @@ -80,10 +77,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"; } @@ -92,8 +86,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 24136cf..90ebd30 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..30705f8 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 c35a3a4..3e4da29 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 6ee60b1..362453f 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 ef93476..e5bfd83 100644 --- a/ipfs-api/src/request/ping.rs +++ b/ipfs-api/src/request/ping.rs @@ -18,8 +18,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 b14ccd6..41adf28 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 path() -> &'static str { - "/pubsub/ls" - } + const PATH: &'static str = "/pubsub/ls"; } @@ -28,10 +25,7 @@ pub struct PubsubPeers<'a> { } impl<'a> ApiRequest for PubsubPeers<'a> { - #[inline] - fn path() -> &'static str { - "/pubsub/peers" - } + const PATH: &'static str = "/pubsub/peers"; } @@ -45,10 +39,7 @@ pub struct PubsubPub<'a> { } impl<'a> ApiRequest for PubsubPub<'a> { - #[inline] - fn path() -> &'static str { - "/pubsub/pub" - } + const PATH: &'static str = "/pubsub/pub"; } @@ -61,8 +52,5 @@ pub struct PubsubSub<'a> { } impl<'a> ApiRequest for PubsubSub<'a> { - #[inline] - fn path() -> &'static str { - "/pubsub/sub" - } + const PATH: &'static str = "/pubsub/sub"; } diff --git a/ipfs-api/src/request/refs.rs b/ipfs-api/src/request/refs.rs index 6c49b97..484869f 100644 --- a/ipfs-api/src/request/refs.rs +++ b/ipfs-api/src/request/refs.rs @@ -14,8 +14,5 @@ pub struct RefsLocal; impl_skip_serialize!(RefsLocal); impl ApiRequest for RefsLocal { - #[inline] - fn path() -> &'static str { - "/refs/local" - } + const PATH: &'static str = "/refs/local"; } diff --git a/ipfs-api/src/request/stats.rs b/ipfs-api/src/request/stats.rs index b3e269b..523de0f 100644 --- a/ipfs-api/src/request/stats.rs +++ b/ipfs-api/src/request/stats.rs @@ -14,10 +14,7 @@ pub struct StatsBitswap; impl_skip_serialize!(StatsBitswap); impl ApiRequest for StatsBitswap { - #[inline] - fn path() -> &'static str { - "/stats/bitswap" - } + const PATH: &'static str = "/stats/bitswap"; } @@ -26,10 +23,7 @@ pub struct StatsBw; impl_skip_serialize!(StatsBw); impl ApiRequest for StatsBw { - #[inli |