diff options
| author | Sameer Puri <sameer@users.noreply.github.com> | 2019-02-08 17:57:34 -0600 |
|---|---|---|
| committer | Sameer Puri <11097096+sameer@users.noreply.github.com> | 2019-02-09 14:45:56 -0600 |
| commit | f125fdbde329095419630e02ebf33d2c73aeced7 (patch) | |
| tree | 371835c998f9f17084b8d46a7abd9661325904ca | |
| parent | 85775a353f9e26a81336f6cbe8941182dc0237e1 (diff) | |
Impose 'static on multipart forms
| -rw-r--r-- | ipfs-api/Cargo.toml | 2 | ||||
| -rw-r--r-- | ipfs-api/src/client.rs | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ipfs-api/Cargo.toml b/ipfs-api/Cargo.toml index 871bb71..f3fb604 100644 --- a/ipfs-api/Cargo.toml +++ b/ipfs-api/Cargo.toml @@ -19,7 +19,7 @@ failure = "0.1.2" futures = "0.1" http = "0.1" hyper = "0.12" -hyper-multipart-rfc7578 = "0.2.0-alpha2" +hyper-multipart-rfc7578 = "0.3.0" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/ipfs-api/src/client.rs b/ipfs-api/src/client.rs index 1db5b4b..0c3277b 100644 --- a/ipfs-api/src/client.rs +++ b/ipfs-api/src/client.rs @@ -116,7 +116,7 @@ impl IpfsClient { fn build_base_request<Req>( &self, req: &Req, - form: Option<multipart::Form>, + form: Option<multipart::Form<'static>>, ) -> Result<Request<hyper::Body>, Error> where Req: ApiRequest + Serialize, @@ -133,7 +133,7 @@ impl IpfsClient { let mut builder = builder.method(Req::METHOD.clone()).uri(url); let req = if let Some(form) = form { - form.set_body(&mut builder) + form.set_body_convert::<hyper::Body, multipart::Body>(&mut builder) } else { builder.body(hyper::Body::empty()) }; @@ -189,7 +189,7 @@ impl IpfsClient { fn request_raw<Req>( &self, req: &Req, - form: Option<multipart::Form>, + form: Option<multipart::Form<'static>>, ) -> AsyncResponse<(StatusCode, Chunk)> where Req: ApiRequest + Serialize, @@ -218,7 +218,7 @@ impl IpfsClient { fn request_stream<Req, Res, F>( &self, req: &Req, - form: Option<multipart::Form>, + form: Option<multipart::Form<'static>>, process: F, ) -> AsyncStreamResponse<Res> where @@ -262,7 +262,7 @@ impl IpfsClient { /// Generic method for making a request to the Ipfs server, and getting /// a deserializable response. /// - fn request<Req, Res>(&self, req: &Req, form: Option<multipart::Form>) -> AsyncResponse<Res> + fn request<Req, Res>(&self, req: &Req, form: Option<multipart::Form<'static>>) -> AsyncResponse<Res> where Req: ApiRequest + Serialize, for<'de> Res: 'static + Deserialize<'de> + Send, @@ -277,7 +277,7 @@ impl IpfsClient { /// Generic method for making a request to the Ipfs server, and getting /// back a response with no body. /// - fn request_empty<Req>(&self, req: &Req, form: Option<multipart::Form>) -> AsyncResponse<()> + fn request_empty<Req>(&self, req: &Req, form: Option<multipart::Form<'static>>) -> AsyncResponse<()> where Req: ApiRequest + Serialize, { @@ -294,7 +294,7 @@ impl IpfsClient { /// Generic method for making a request to the Ipfs server, and getting /// back a raw String response. /// - fn request_string<Req>(&self, req: &Req, form: Option<multipart::Form>) -> AsyncResponse<String> + fn request_string<Req>(&self, req: &Req, form: Option<multipart::Form<'static>>) -> AsyncResponse<String> where Req: ApiRequest + Serialize, { @@ -314,7 +314,7 @@ impl IpfsClient { fn request_stream_bytes<Req>( &self, req: &Req, - form: Option<multipart::Form>, + form: Option<multipart::Form<'static>>, ) -> AsyncStreamResponse<Chunk> where Req: ApiRequest + Serialize, @@ -328,7 +328,7 @@ impl IpfsClient { fn request_stream_json<Req, Res>( &self, req: &Req, - form: Option<multipart::Form>, + form: Option<multipart::Form<'static>>, ) -> AsyncStreamResponse<Res> where Req: ApiRequest + Serialize, |