diff --git a/echo-server/Cargo.toml b/echo-server/Cargo.toml
index 99cfe3c..dd30d0f 100644
--- a/echo-server/Cargo.toml
+++ b/echo-server/Cargo.toml
@@ -2,5 +2,6 @@
 name = "echo-server"
 version = "0.1.0"
 authors = ["You <you@example.com>"]
+edition = "2018"
 
 [dependencies]
diff --git a/echo-server/src/main.rs b/echo-server/src/main.rs
index c2366bf..f96e731 100644
--- a/echo-server/src/main.rs
+++ b/echo-server/src/main.rs
@@ -1,3 +1,6 @@
+#![warn(rust_2018_idioms)]
+#![allow(elided_lifetimes_in_paths)]
+
 use std::net::TcpListener;
 use std::io;
 use std::thread::spawn;