1
0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-23 16:21:06 +01:00

re-export actix_rt::main macro (#1559)

This commit is contained in:
Rob Ede 2020-06-18 15:45:30 +01:00 committed by GitHub
parent 0ba73fc44c
commit dc74db1f2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 6 deletions

View File

@ -2,6 +2,10 @@
## [Unreleased]
### Added
* Re-export `actix_rt::main` as `actix_web::main`.
### Changed
* Fix actix_http::h1::dispatcher so it returns when HW_BUFFER_SIZE is reached. Should reduce peak memory consumption during large uploads. [#1550]

View File

@ -69,7 +69,7 @@ actix-codec = "0.2.0"
actix-service = "1.0.2"
actix-utils = "1.0.6"
actix-router = "0.2.4"
actix-rt = "1.0.0"
actix-rt = "1.1.1"
actix-server = "1.0.0"
actix-testing = "1.0.0"
actix-macros = "0.1.0"

View File

@ -53,7 +53,6 @@ Dependencies:
```toml
[dependencies]
actix-web = "2"
actix-rt = "1"
```
Code:
@ -66,7 +65,7 @@ async fn index(info: web::Path<(u32, String)>) -> impl Responder {
format!("Hello {}! id:{}", info.1, info.0)
}
#[actix_rt::main]
#[actix_web::main]
async fn main() -> std::io::Result<()> {
HttpServer::new(|| App::new().service(index))
.bind("127.0.0.1:8080")?

View File

@ -16,7 +16,7 @@ async fn no_params() -> &'static str {
"Hello world!\r\n"
}
#[actix_rt::main]
#[actix_web::main]
async fn main() -> std::io::Result<()> {
std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
env_logger::init();

View File

@ -1,6 +1,6 @@
use actix_http::Error;
#[actix_rt::main]
#[actix_web::main]
async fn main() -> Result<(), Error> {
std::env::set_var("RUST_LOG", "actix_http=trace");
env_logger::init();

View File

@ -20,7 +20,7 @@ async fn no_params() -> &'static str {
}
#[cfg(unix)]
#[actix_rt::main]
#[actix_web::main]
async fn main() -> std::io::Result<()> {
std::env::set_var("RUST_LOG", "actix_server=info,actix_web=info");
env_logger::init();

View File

@ -112,6 +112,7 @@ pub use actix_web_codegen::*;
// re-export for convenience
pub use actix_http::Response as HttpResponse;
pub use actix_http::{body, cookie, http, Error, HttpMessage, ResponseError, Result};
pub use actix_macros::{main, test as test_rt};
pub use crate::app::App;
pub use crate::extract::FromRequest;