From eb5d206dd943f57620f8ec7aa164fee7c52c8d9b Mon Sep 17 00:00:00 2001 From: Tangent 128 Date: Sat, 22 Dec 2018 15:07:38 -0500 Subject: [PATCH] Use Rust 2018 Edition --- Cargo.toml | 1 + src/commands/relay.rs | 3 ++- src/lib.rs | 5 ----- src/main.rs | 13 +------------ 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9bb8a15..e6462fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "webmetro" version = "0.2.0" authors = ["Tangent 128 "] +edition = "2018" [dependencies] bytes = "0.4.10" diff --git a/src/commands/relay.rs b/src/commands/relay.rs index 2f81bdc..ca49d7b 100644 --- a/src/commands/relay.rs +++ b/src/commands/relay.rs @@ -24,7 +24,8 @@ use hyper::{ }; use warp::{ self, - Filter + Filter, + path }; use weak_table::{ WeakValueHashMap diff --git a/src/lib.rs b/src/lib.rs index 07246da..e11055c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,4 @@ -extern crate bytes; -extern crate futures; -extern crate odds; -extern crate tokio; - pub mod ebml; pub mod error; pub mod iterator; diff --git a/src/main.rs b/src/main.rs index b8fdcdd..3962669 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,7 @@ -extern crate bytes; -#[macro_use] extern crate clap; -extern crate futures; -extern crate http; -extern crate hyper; -extern crate tokio; -extern crate tokio_codec; -extern crate tokio_io; -#[macro_use] extern crate warp; -extern crate weak_table; -extern crate webmetro; mod commands; -use clap::{App, AppSettings}; +use clap::{App, AppSettings, crate_version}; use crate::commands::{ relay,