Skip to content

Commit 7e87e4e

Browse files
tirr-cyoshuawuyts
authored andcommitted
Update to nightly-2019-02-27 and make it default (#146)
* Update to nightly-2019-03-05 and make it default * Run rustfmt * Rollback to nightly-2019-03-02 due to ICE * Rollback to nightly-2019-02-27 that has clippy * Let travis setup script install pinned nightly version
1 parent 70ed8aa commit 7e87e4e

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
language: rust
22
rust:
3-
- nightly
3+
- nightly-2019-02-27
44

55
before_script: |
6-
rustup install nightly-2019-02-21
7-
rustup component add rustfmt-preview clippy-preview
6+
rustup component add rustfmt clippy
87
script: |
98
cargo fmt --all -- --check &&
109
cargo clippy --all -- -D clippy::all &&

tests/wildcard.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#![feature(futures_api, async_await)]
22

3-
use http_service::{Body};
4-
use futures::{executor::block_on};
5-
use tide::{
6-
head::{Named, NamedSegment}
7-
};
8-
use http_service_mock::{make_server};
3+
use futures::executor::block_on;
4+
use http_service::Body;
5+
use http_service_mock::make_server;
6+
use tide::head::{Named, NamedSegment};
97

108
struct Number(i32);
119

@@ -27,7 +25,7 @@ async fn add_one(Named(Number(num)): Named<Number>) -> String {
2725
#[test]
2826
fn wildcard() {
2927
let mut app = tide::App::new(());
30-
app.at("/add_one/{num}").get(add_one);
28+
app.at("/add_one/{num}").get(add_one);
3129
let mut server = make_server(app.into_http_service()).unwrap();
3230

3331
let req = http::Request::get("/add_one/3")
@@ -50,7 +48,7 @@ fn wildcard() {
5048
#[test]
5149
fn invalid_segment_error() {
5250
let mut app = tide::App::new(());
53-
app.at("/add_one/{num}").get(add_one);
51+
app.at("/add_one/{num}").get(add_one);
5452
let mut server = make_server(app.into_http_service()).unwrap();
5553

5654
let req = http::Request::get("/add_one/a")
@@ -63,7 +61,7 @@ fn invalid_segment_error() {
6361
#[test]
6462
fn not_found_error() {
6563
let mut app = tide::App::new(());
66-
app.at("/add_one/{num}").get(add_one);
64+
app.at("/add_one/{num}").get(add_one);
6765
let mut server = make_server(app.into_http_service()).unwrap();
6866

6967
let req = http::Request::get("/add_one/").body(Body::empty()).unwrap();

0 commit comments

Comments
 (0)