actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-23 23:51:06 +01:00
Code Issues Releases Wiki Activity

Merge pull request #6 from kathampy/master

Browse Source 
Upgrade to `prost-0.5` and `prost-derive-0.5`; `dyn Future` warning
This commit is contained in:
Yuki Okushi 2019-10-02 17:35:51 +09:00 committed by GitHub
commit 789f2d1b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -26,11 +26,11 @@ derive_more = "0.14"
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-rc" actix-web = "1.0.0-rc"
prost = "0.4" prost = "0.5.0"
[dev-dependencies] [dev-dependencies]
http = "^0.1" http = "^0.1"
prost-derive = "^0.4" prost-derive = "0.5.0"
[workspace] [workspace]
members = [ members = [

4
src/lib.rs
View File

@ -125,7 +125,7 @@ where
{ {
type Config = ProtoBufConfig; type Config = ProtoBufConfig;
type Error = Error; type Error = Error;
type Future = Box<Future<Item = Self, Error = Error>>; type Future = Box<dyn Future<Item = Self, Error = Error>>;
#[inline] #[inline]
fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future { fn from_request(req: &HttpRequest, payload: &mut Payload) -> Self::Future {
@ -164,7 +164,7 @@ pub struct ProtoBufMessage<T: Message + Default> {
length: Option<usize>, length: Option<usize>,
stream: Option<Payload>, stream: Option<Payload>,
err: Option<ProtoBufPayloadError>, err: Option<ProtoBufPayloadError>,
fut: Option<Box<Future<Item = T, Error = ProtoBufPayloadError>>>, fut: Option<Box<dyn Future<Item = T, Error = ProtoBufPayloadError>>>,
} }
impl<T: Message + Default> ProtoBufMessage<T> { impl<T: Message + Default> ProtoBufMessage<T> {