diff --git a/.travis.yml b/.travis.yml index 67d27b91..6251bced 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,13 @@ before_script: - export PATH=$PATH:~/.cargo/bin script: - - USE_SKEPTIC=1 cargo test --features=alpn + - | + if [[ "$TRAVIS_RUST_VERSION" == "nightly-2017-12-21" ]]; then + USE_SKEPTIC=1 cargo test --features=alpn + else + cargo test --features=alpn + fi + - | if [[ "$TRAVIS_RUST_VERSION" == "beta" ]]; then cd examples/diesel && cargo check && cd ../.. diff --git a/guide/src/qs_9.md b/guide/src/qs_9.md index aa8bfd5f..7feb7d94 100644 --- a/guide/src/qs_9.md +++ b/guide/src/qs_9.md @@ -21,8 +21,8 @@ impl Actor for Ws { } /// Define Handler for ws::Message message -# impl StreamHandler for WsRoute {} -impl Handler for WsRoute { +# impl StreamHandler for Ws {} +impl Handler for Ws { fn handle(&mut self, msg: ws::Message, ctx: &mut HttpContext) -> Response { match msg { @@ -37,7 +37,7 @@ impl Handler for WsRoute { fn main() { Application::new() - .resource("/ws/", |r| r.f(|req| ws::start(req, WS)) // <- register websocket route + .resource("/ws/", |r| r.f(|req| ws::start(req, Ws))) // <- register websocket route .finish(); } ```