1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-14 12:51:17 +00:00

rename to actix-web

This commit is contained in:
Nikolay Kim 2017-10-14 07:59:35 -07:00
parent eedef6633c
commit 95987daa72
6 changed files with 20 additions and 21 deletions

View file

@ -59,7 +59,7 @@ after_success:
make install DESTDIR=../../kcov-build && make install DESTDIR=../../kcov-build &&
cd ../.. && cd ../.. &&
rm -rf kcov-master && rm -rf kcov-master &&
for file in target/debug/actix_http-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done && for file in target/debug/actix_web-*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
for file in target/debug/test_*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done && for file in target/debug/test_*[^\.d]; do mkdir -p "target/cov/$(basename $file)"; ./kcov-build/usr/local/bin/kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
bash <(curl -s https://codecov.io/bash) && bash <(curl -s https://codecov.io/bash) &&
echo "Uploaded code coverage" echo "Uploaded code coverage"

View file

@ -1,20 +1,19 @@
[package] [package]
name = "actix-http" name = "actix-web"
version = "0.1.0" version = "0.1.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix http support" description = "Actix web framework"
readme = "README.md" readme = "README.md"
keywords = ["actor", "http"] keywords = ["actor", "http", "web"]
homepage = "https://github.com/fafhrd91/actix-http" homepage = "https://github.com/fafhrd91/actix-web"
repository = "https://github.com/fafhrd91/actix-http.git" repository = "https://github.com/fafhrd91/actix-web.git"
documentation = "https://fafhrd91.github.io/actix-http/actix-http/"
categories = ["network-programming", "asynchronous"] categories = ["network-programming", "asynchronous"]
license = "Apache-2.0" license = "Apache-2.0"
exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"]
build = "build.rs" build = "build.rs"
[lib] [lib]
name = "actix_http" name = "actix_web"
path = "src/lib.rs" path = "src/lib.rs"
[[bin]] [[bin]]

View file

@ -2,7 +2,7 @@
Actix http is a server http framework for Actix framework. Actix http is a server http framework for Actix framework.
* [API Documentation](http://fafhrd91.github.io/actix-http/actix_http/) * [API Documentation](http://fafhrd91.github.io/actix-web/actix_web/)
* Cargo package: [actix-http](https://crates.io/crates/actix-http) * Cargo package: [actix-http](https://crates.io/crates/actix-http)
* Minimum supported Rust version: 1.20 or later * Minimum supported Rust version: 1.20 or later
@ -15,29 +15,29 @@ Actix http is licensed under the [Apache-2.0 license](http://opensource.org/lice
* HTTP 1.1 and 1.0 support * HTTP 1.1 and 1.0 support
* Streaming and pipelining support * Streaming and pipelining support
* Keep-alive and slow requests support * Keep-alive and slow requests support
* [WebSockets support](https://fafhrd91.github.io/actix-http/actix_http/ws/index.html) * [WebSockets support](https://fafhrd91.github.io/actix-web/actix_web/ws/index.html)
* [Configurable request routing](https://fafhrd91.github.io/actix-http/actix_http/struct.RoutingMap.html) * [Configurable request routing](https://fafhrd91.github.io/actix-web/actix_web/struct.RoutingMap.html)
## Usage ## Usage
To use `actix-http`, add this to your `Cargo.toml`: To use `actix-web`, add this to your `Cargo.toml`:
```toml ```toml
[dependencies] [dependencies]
actix-http = { git = "https://github.com/fafhrd91/actix-http.git" } actix-web = { git = "https://github.com/fafhrd91/actix-web.git" }
``` ```
## Example ## Example
```rust ```rust
extern crate actix; extern crate actix;
extern crate actix_http; extern crate actix_web;
extern crate futures; extern crate futures;
use std::net; use std::net;
use std::str::FromStr; use std::str::FromStr;
use actix::prelude::*; use actix::prelude::*;
use actix_http::*; use actix_web::*;
// Route // Route
struct MyRoute; struct MyRoute;

View file

@ -1,11 +1,11 @@
//! The `actix-http` prelude for library developers //! The `actix-web` prelude for library developers
//! //!
//! The purpose of this module is to alleviate imports of many common actix traits //! The purpose of this module is to alleviate imports of many common actix traits
//! by adding a glob import to the top of actix heavy modules: //! by adding a glob import to the top of actix heavy modules:
//! //!
//! ``` //! ```
//! # #![allow(unused_imports)] //! # #![allow(unused_imports)]
//! use actix_http::dev::*; //! use actix_web::dev::*;
//! ``` //! ```
pub use ws; pub use ws;
pub use httpcodes; pub use httpcodes;

View file

@ -1,7 +1,7 @@
// #![feature(try_trait)] // #![feature(try_trait)]
#![allow(dead_code, unused_variables)] #![allow(dead_code, unused_variables)]
extern crate actix; extern crate actix;
extern crate actix_http; extern crate actix_web;
extern crate tokio_core; extern crate tokio_core;
extern crate env_logger; extern crate env_logger;
@ -9,7 +9,7 @@ use std::net;
use std::str::FromStr; use std::str::FromStr;
use actix::prelude::*; use actix::prelude::*;
use actix_http::*; use actix_web::*;
struct MyRoute {req: Option<HttpRequest>} struct MyRoute {req: Option<HttpRequest>}

View file

@ -7,9 +7,9 @@
//! //!
//! ```rust //! ```rust
//! extern crate actix; //! extern crate actix;
//! extern crate actix_http; //! extern crate actix_web;
//! use actix::prelude::*; //! use actix::prelude::*;
//! use actix_http::*; //! use actix_web::*;
//! //!
//! // WebSocket Route //! // WebSocket Route
//! struct WsRoute; //! struct WsRoute;