From 8891c2681e2a3d944b87e5391cabff524ec507de Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sun, 21 Nov 2021 23:42:51 +0000 Subject: [PATCH] address unused warning --- actix-server/src/builder.rs | 6 +- actix-service/CHANGES.md | 204 ++++++++---------------------------- 2 files changed, 46 insertions(+), 164 deletions(-) diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs index 4f4d6e26..a63e5652 100644 --- a/actix-server/src/builder.rs +++ b/actix-server/src/builder.rs @@ -8,8 +8,7 @@ use crate::{ server::ServerCommand, service::{InternalServiceFactory, ServiceFactory, StreamNewService}, socket::{ - create_mio_tcp_listener, MioListener, MioTcpListener, StdSocketAddr, StdTcpListener, - ToSocketAddrs, + create_mio_tcp_listener, MioListener, MioTcpListener, StdTcpListener, ToSocketAddrs, }, worker::ServerWorkerConfig, Server, @@ -243,7 +242,8 @@ impl ServerBuilder { use std::net::{IpAddr, Ipv4Addr}; lst.set_nonblocking(true)?; let token = self.next_token(); - let addr = StdSocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080); + let addr = + crate::socket::StdSocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080); self.factories.push(StreamNewService::create( name.as_ref().to_string(), token, diff --git a/actix-service/CHANGES.md b/actix-service/CHANGES.md index c01fd8dd..c87e2470 100644 --- a/actix-service/CHANGES.md +++ b/actix-service/CHANGES.md @@ -56,221 +56,124 @@ ## 1.0.6 - 2020-08-09 - -### Fixed - * Removed unsound custom Cell implementation that allowed obtaining several mutable references to the same data, which is undefined behavior in Rust and could lead to violations of memory safety. External code could obtain several mutable references to the same data through service combinators. Attempts to acquire several mutable references to the same data will instead result in a panic. -## [1.0.5] - 2020-01-16 -### Fixed +## 1.0.5 - 2020-01-16 +* Fixed unsoundness in .and_then()/.then() service combinators. -* Fixed unsoundness in .and_then()/.then() service combinators - -## [1.0.4] - 2020-01-15 - -### Fixed +## 1.0.4 - 2020-01-15 * Revert 1.0.3 change -## [1.0.3] - 2020-01-15 -### Fixed - -* Fixed unsoundness in `AndThenService` impl - -## [1.0.2] - 2020-01-08 - -### Added - -* Add `into_service` helper function +## 1.0.3 - 2020-01-15 +* Fixed unsoundness in `AndThenService` impl. -## [1.0.1] - 2019-12-22 - -### Changed - -* `map_config()` and `unit_config()` accepts `IntoServiceFactory` type +## 1.0.2 - 2020-01-08 +* Add `into_service` helper function. -## [1.0.0] - 2019-12-11 +## 1.0.1 - 2019-12-22 +* `map_config()` and `unit_config()` now accept `IntoServiceFactory` type. -### Added +## 1.0.0 - 2019-12-11 * Add Clone impl for Apply service -## [1.0.0-alpha.4] - 2019-12-08 - -### Changed - +## 1.0.0-alpha.4 - 2019-12-08 * Renamed `service_fn` to `fn_service` - * Renamed `factory_fn` to `fn_factory` - * Renamed `factory_fn_cfg` to `fn_factory_with_config` -## [1.0.0-alpha.3] - 2019-12-06 - -### Changed - +## 1.0.0-alpha.3 - 2019-12-06 * Add missing Clone impls - * Restore `Transform::map_init_err()` combinator - * Restore `Service/Factory::apply_fn()` in form of `Pipeline/Factory::and_then_apply_fn()` - * Optimize service combinators and futures memory layout -## [1.0.0-alpha.2] - 2019-12-02 - -### Changed - +## 1.0.0-alpha.2 - 2019-12-02 * Use owned config value for service factory - * Renamed BoxedNewService/BoxedService to BoxServiceFactory/BoxService -## [1.0.0-alpha.1] - 2019-11-25 - -### Changed - -* Migraded to `std::future` - +## 1.0.0-alpha.1 - 2019-11-25 +* Migrated to `std::future` * `NewService` renamed to `ServiceFactory` - * Added `pipeline` and `pipeline_factory` function -## [0.4.2] - 2019-08-27 - -### Fixed - +## 0.4.2 - 2019-08-27 * Check service readiness for `new_apply_cfg` combinator -## [0.4.1] - 2019-06-06 - -### Added - +## 0.4.1 - 2019-06-06 * Add `new_apply_cfg` function -## [0.4.0] - 2019-05-12 -### Changed - -* Use associated type for `NewService` config - -* Change `apply_cfg` function - -* Renamed helper functions - -### Added - -* Add `NewService::map_config` and `NewService::unit_config` combinators +## 0.4.0 - 2019-05-12 +* Add `NewService::map_config` and `NewService::unit_config` combinators. +* Use associated type for `NewService` config. +* Change `apply_cfg` function. +* Renamed helper functions. -## [0.3.6] - 2019-04-07 - -### Changed - +## 0.3.6 - 2019-04-07 * Poll boxed service call result immediately -## [0.3.5] - 2019-03-29 - -### Added - -* Add `impl Service for Rc>` +## 0.3.5 - 2019-03-29 +* Add `impl Service for Rc>`. -## [0.3.4] - 2019-03-12 - -### Added - +## 0.3.4 - 2019-03-12 * Add `Transform::from_err()` combinator - * Add `apply_fn` helper - * Add `apply_fn_factory` helper - * Add `apply_transform` helper - * Add `apply_cfg` helper -## [0.3.3] - 2019-03-09 - -### Added - +## 0.3.3 - 2019-03-09 * Add `ApplyTransform` new service for transform and new service. - -* Add `NewService::apply_cfg()` combinator, allows to use - nested `NewService` with different config parameter. - -### Changed - +* Add `NewService::apply_cfg()` combinator, allows to use nested `NewService` with different config parameter. * Revert IntoFuture change -## [0.3.2] - 2019-03-04 - -### Changed - +## 0.3.2 - 2019-03-04 * Change `NewService::Future` and `Transform::Future` to the `IntoFuture` trait. - * Export `AndThenTransform` type -## [0.3.1] - 2019-03-04 - -### Changed - +## 0.3.1 - 2019-03-04 * Simplify Transform trait -## [0.3.0] - 2019-03-02 - -## Added - +## 0.3.0 - 2019-03-02 * Added boxed NewService and Service. - -## Changed - * Added `Config` parameter to `NewService` trait. - * Added `Config` parameter to `NewTransform` trait. -## [0.2.2] - 2019-02-19 - -### Added - +## 0.2.2 - 2019-02-19 * Added `NewService` impl for `Rc where S: NewService` - * Added `NewService` impl for `Arc where S: NewService` -## [0.2.1] - 2019-02-03 - -### Changed - +## 0.2.1 - 2019-02-03 * Generalize `.apply` combinator with Transform trait -## [0.2.0] - 2019-02-01 - -### Changed - +## 0.2.0 - 2019-02-01 * Use associated type instead of generic for Service definition. - * Before: - ```rust impl Service for Client { type Response = Response; @@ -278,7 +181,6 @@ } ``` * After: - ```rust impl Service for Client { type Request = Request; @@ -288,50 +190,30 @@ ``` -## [0.1.6] - 2019-01-24 - -### Changed - +## 0.1.6 - 2019-01-24 * Use `FnMut` instead of `Fn` for .apply() and .map() combinators and `FnService` type - * Change `.apply()` error semantic, new service's error is `From` -## [0.1.5] - 2019-01-13 - -### Changed - -* Make `Out::Error` convertable from `T::Error` for apply combinator +## 0.1.5 - 2019-01-13 +* Make `Out::Error` convertible from `T::Error` for apply combinator -## [0.1.4] - 2019-01-11 - -### Changed - +## 0.1.4 - 2019-01-11 * Use `FnMut` instead of `Fn` for `FnService` -## [0.1.3] - 2018-12-12 - -### Changed - +## 0.1.3 - 2018-12-12 * Split service combinators to separate trait -## [0.1.2] - 2018-12-12 - -### Fixed - +## 0.1.2 - 2018-12-12 * Release future early for `.and_then()` and `.then()` combinators -## [0.1.1] - 2018-12-09 - -### Added - -* Added Service impl for Box +## 0.1.1 - 2018-12-09 +* Added Service impl for `Box` -## [0.1.0] - 2018-12-09 - +## 0.1.0 - 2018-12-09 * Initial import