Skip to content

Commit ad5a509

Browse files
authored
Merge pull request #46 from Turbo87/2018
Add `edition = 2018` to all packages
2 parents 81bf2fa + 06cc2de commit ad5a509

File tree

4 files changed

+3
-9
lines changed

4 files changed

+3
-9
lines changed

conduit-test/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ authors = ["[email protected]",
66
description = "Testing utilities for conduit-based stacks"
77
repository = "https://github.com/conduit-rust/conduit"
88
license = "MIT"
9+
edition = "2018"
910

1011
[dependencies]
1112
conduit = { version = "0.9.0-alpha.5", path = "../conduit" }

conduit-test/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#![warn(rust_2018_idioms)]
2-
extern crate conduit;
3-
41
use std::borrow::Cow;
52
use std::io::{Cursor, Read};
63
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};

examples/basic/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "example"
33
version = "0.0.1"
44
authors = ["Example User <[email protected]>"]
5+
edition = "2018"
56

67
[dependencies]
78
civet = "0.12.0-alpha.5"

examples/basic/src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
extern crate civet;
2-
extern crate conduit;
3-
extern crate conduit_router;
4-
5-
use std::sync::mpsc::channel;
6-
71
use civet::{Config, Server};
82
use conduit::{Body, HttpResult, RequestExt, Response};
93
use conduit_router::{RequestParams, RouteBuilder};
4+
use std::sync::mpsc::channel;
105

116
fn name(req: &mut dyn RequestExt) -> HttpResult {
127
let name = req.params().find("name").unwrap();

0 commit comments

Comments
 (0)