Skip to content

Commit

Permalink
rust 1.31.0 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
fafhrd91 committed Apr 1, 2019
1 parent 34695f4 commit 96fd61f
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 9 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cache:

matrix:
include:
- rust: 1.31.0
- rust: stable
- rust: beta
- rust: nightly-2019-03-02
Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,7 @@ flate2 = "1.0.2"
lto = true
opt-level = 3
codegen-units = 1

[patch.crates-io]
actix = { git = "https://github.com/actix/actix.git" }
actix-http = { path = "actix-http" }
6 changes: 4 additions & 2 deletions actix-files/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,10 @@ mod tests {
use bytes::BytesMut;

use super::*;
use actix_web::http::{header, header::DispositionType, Method, StatusCode};
use actix_web::http::header::{
self, ContentDisposition, DispositionParam, DispositionType,
};
use actix_web::http::{Method, StatusCode};
use actix_web::test::{self, TestRequest};
use actix_web::App;

Expand Down Expand Up @@ -683,7 +686,6 @@ mod tests {

#[test]
fn test_named_file_image_attachment() {
use header::{ContentDisposition, DispositionParam, DispositionType};
let cd = ContentDisposition {
disposition: DispositionType::Attachment,
parameters: vec![DispositionParam::Filename(String::from("test.png"))],
Expand Down
7 changes: 7 additions & 0 deletions actix-http/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changes

## [0.1.0-alpha.3] - 2019-04-xx

### Fixed

* Rust 1.31.0 compatibility


## [0.1.0-alpha.2] - 2019-03-29

### Added
Expand Down
12 changes: 6 additions & 6 deletions actix-http/src/cookie/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ mod parse;
#[macro_use]
mod secure;
#[cfg(feature = "secure-cookies")]
pub use secure::*;
pub use self::secure::*;

use std::borrow::Cow;
use std::fmt;
Expand All @@ -68,11 +68,11 @@ use std::str::FromStr;
use percent_encoding::{percent_encode, USERINFO_ENCODE_SET};
use time::{Duration, Tm};

pub use builder::CookieBuilder;
pub use draft::*;
pub use jar::{CookieJar, Delta, Iter};
use parse::parse_cookie;
pub use parse::ParseError;
pub use self::builder::CookieBuilder;
pub use self::draft::*;
pub use self::jar::{CookieJar, Delta, Iter};
use self::parse::parse_cookie;
pub use self::parse::ParseError;

#[derive(Debug, Clone)]
enum CookieStr {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
//! * SSL support with OpenSSL or `native-tls`
//! * Middlewares (`Logger`, `Session`, `CORS`, `CSRF`, `DefaultHeaders`)
//! * Supports [Actix actor framework](https://github.com/actix/actix)
//! * Supported Rust version: 1.32 or later
//! * Supported Rust version: 1.31 or later
//!
//! ## Package feature
//!
Expand Down

0 comments on commit 96fd61f

Please sign in to comment.