diff --git a/CHANGES.md b/CHANGES.md index 689ab13dd..bbb13d7b6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,10 @@ ## [1.0.9] - 2019-xx-xx +### Deleted + +* Removed hashbrown dependency as it is [core in rust 1.36.0](https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1360-2019-07-04) + ### Added * Add `Payload::into_inner` method and make stored `def::Payload` public. (#1110) diff --git a/Cargo.toml b/Cargo.toml index 35ca28b2c..0ff8694e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,6 @@ bytes = "0.4" derive_more = "0.15.0" encoding_rs = "0.8" futures = "0.1.25" -hashbrown = "0.5.0" log = "0.4" mime = "0.3" net2 = "0.2.33" diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 624aca5eb..9edc0b696 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -2,6 +2,10 @@ ## Not released yet +### Deleted + +* Removed hashbrown dependency as it is [core in rust 1.36.0](https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1360-2019-07-04) + ### Added * Add support for serde_json::Value to be passed as argument to ResponseBuilder.body() diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index cc7c885e7..581dc2cd4 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -62,7 +62,6 @@ derive_more = "0.15.0" either = "1.5.2" encoding_rs = "0.8" futures = "0.1.25" -hashbrown = "0.5.0" h2 = "0.1.16" http = "0.1.17" httparse = "1.3" diff --git a/actix-http/README.md b/actix-http/README.md index d75e822ba..769c22d4a 100644 --- a/actix-http/README.md +++ b/actix-http/README.md @@ -8,7 +8,7 @@ Actix http * [API Documentation](https://docs.rs/actix-http/) * [Chat on gitter](https://gitter.im/actix/actix) * Cargo package: [actix-http](https://crates.io/crates/actix-http) -* Minimum supported Rust version: 1.31 or later +* Minimum supported Rust version: 1.36 or later ## Example diff --git a/actix-http/src/client/pool.rs b/actix-http/src/client/pool.rs index a3522ff8a..f4af3fde3 100644 --- a/actix-http/src/client/pool.rs +++ b/actix-http/src/client/pool.rs @@ -12,7 +12,7 @@ use futures::task::AtomicTask; use futures::unsync::oneshot; use futures::{Async, Future, Poll}; use h2::client::{handshake, Handshake}; -use hashbrown::HashMap; +use std::collections::HashMap; use http::uri::Authority; use indexmap::IndexSet; use slab::Slab; diff --git a/actix-http/src/extensions.rs b/actix-http/src/extensions.rs index c6266f56e..2bd0bf2f2 100644 --- a/actix-http/src/extensions.rs +++ b/actix-http/src/extensions.rs @@ -1,7 +1,7 @@ use std::any::{Any, TypeId}; use std::fmt; -use hashbrown::HashMap; +use std::collections::HashMap; #[derive(Default)] /// A type map of request extensions. diff --git a/actix-http/src/header/map.rs b/actix-http/src/header/map.rs index f2f1ba51c..9d2a0081c 100644 --- a/actix-http/src/header/map.rs +++ b/actix-http/src/header/map.rs @@ -1,6 +1,6 @@ use either::Either; -use hashbrown::hash_map::{self, Entry}; -use hashbrown::HashMap; +use std::collections::hash_map::{self, Entry}; +use std::collections::HashMap; use http::header::{HeaderName, HeaderValue}; use http::HttpTryFrom; diff --git a/actix-session/CHANGES.md b/actix-session/CHANGES.md index d85f6d5f1..de856640f 100644 --- a/actix-session/CHANGES.md +++ b/actix-session/CHANGES.md @@ -1,5 +1,11 @@ # Changes +## Not released yet + +### Deleted + +* Removed hashbrown dependency as it is [core in rust 1.36.0](https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1360-2019-07-04) + ## [0.2.0] - 2019-07-08 * Enhanced ``actix-session`` to facilitate state changes. Use ``Session.renew()`` diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index d973661ef..833c6e46f 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -29,7 +29,6 @@ actix-service = "0.4.1" bytes = "0.4" derive_more = "0.15.0" futures = "0.1.25" -hashbrown = "0.5.0" serde = "1.0" serde_json = "1.0" time = "0.1.42" diff --git a/actix-session/README.md b/actix-session/README.md index 0aee756fd..33c9b4f43 100644 --- a/actix-session/README.md +++ b/actix-session/README.md @@ -6,4 +6,4 @@ * [API Documentation](https://docs.rs/actix-session/) * [Chat on gitter](https://gitter.im/actix/actix) * Cargo package: [actix-session](https://crates.io/crates/actix-session) -* Minimum supported Rust version: 1.34 or later +* Minimum supported Rust version: 1.36 or later diff --git a/actix-session/src/lib.rs b/actix-session/src/lib.rs index 2e9e51714..6da9e5404 100644 --- a/actix-session/src/lib.rs +++ b/actix-session/src/lib.rs @@ -47,7 +47,7 @@ use std::rc::Rc; use actix_web::dev::{Extensions, Payload, ServiceRequest, ServiceResponse}; use actix_web::{Error, FromRequest, HttpMessage, HttpRequest}; -use hashbrown::HashMap; +use std::collections::HashMap; use serde::de::DeserializeOwned; use serde::Serialize; use serde_json; diff --git a/src/middleware/errhandlers.rs b/src/middleware/errhandlers.rs index 5f73d4d7e..fba486812 100644 --- a/src/middleware/errhandlers.rs +++ b/src/middleware/errhandlers.rs @@ -4,7 +4,7 @@ use std::rc::Rc; use actix_service::{Service, Transform}; use futures::future::{err, ok, Either, Future, FutureResult}; use futures::Poll; -use hashbrown::HashMap; +use std::collections::HashMap; use crate::dev::{ServiceRequest, ServiceResponse}; use crate::error::{Error, Result}; diff --git a/src/rmap.rs b/src/rmap.rs index 42ddb1349..f9138b911 100644 --- a/src/rmap.rs +++ b/src/rmap.rs @@ -2,7 +2,7 @@ use std::cell::RefCell; use std::rc::Rc; use actix_router::ResourceDef; -use hashbrown::HashMap; +use std::collections::HashMap; use url::Url; use crate::error::UrlGenerationError;