From 87eaed9c82b570742f133a8356e5a5e42dc905df Mon Sep 17 00:00:00 2001
From: Tangent 128 <Tangent128@gmail.com>
Date: Sat, 22 Dec 2018 15:03:19 -0500
Subject: [PATCH] cargo fix for Rust 2018

---
 src/channel.rs       |  2 +-
 src/chunk.rs         |  8 ++++----
 src/ebml.rs          |  8 ++++----
 src/error.rs         |  2 +-
 src/fixers.rs        |  4 ++--
 src/iterator.rs      |  2 +-
 src/lib.rs           |  2 +-
 src/main.rs          |  2 +-
 src/slice.rs         |  6 +++---
 src/stream_parser.rs |  6 +++---
 src/webm.rs          | 10 +++++-----
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/channel.rs b/src/channel.rs
index ced5bf8..c5e6e01 100644
--- a/src/channel.rs
+++ b/src/channel.rs
@@ -16,7 +16,7 @@ use futures::{
 };
 use odds::vec::VecExt;
 
-use chunk::Chunk;
+use crate::chunk::Chunk;
 
 pub enum Never {}
 
diff --git a/src/chunk.rs b/src/chunk.rs
index 1b63499..477e204 100644
--- a/src/chunk.rs
+++ b/src/chunk.rs
@@ -4,9 +4,9 @@ use std::{
     io::Cursor,
     mem
 };
-use ebml::EbmlEventSource;
-use error::WebmetroError;
-use webm::*;
+use crate::ebml::EbmlEventSource;
+use crate::error::WebmetroError;
+use crate::webm::*;
 
 #[derive(Clone, Debug)]
 pub struct ClusterHead {
@@ -281,7 +281,7 @@ impl<T: EbmlEventSource> WebmStream for T {}
 #[cfg(test)]
 mod tests {
 
-    use chunk::*;
+    use crate::chunk::*;
 
     #[test]
     fn enough_space_for_header() {
diff --git a/src/ebml.rs b/src/ebml.rs
index d5bb72c..0d15f05 100644
--- a/src/ebml.rs
+++ b/src/ebml.rs
@@ -305,11 +305,11 @@ pub trait EbmlEventSource {
 #[cfg(test)]
 mod tests {
     use bytes::{BytesMut};
-    use ebml::*;
-    use ebml::EbmlError::{CorruptVarint, UnknownElementId};
-    use ebml::Varint::{Unknown, Value};
+    use crate::ebml::*;
+    use crate::ebml::EbmlError::{CorruptVarint, UnknownElementId};
+    use crate::ebml::Varint::{Unknown, Value};
     use std::io::Cursor;
-    use tests::TEST_FILE;
+    use crate::tests::TEST_FILE;
 
     #[test]
     fn fail_corrupted_varints() {
diff --git a/src/error.rs b/src/error.rs
index 201952d..7a0ca38 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -8,7 +8,7 @@ use std::{
     io::Error as IoError
 };
 
-use ebml::EbmlError;
+use crate::ebml::EbmlError;
 
 #[derive(Debug)]
 pub enum WebmetroError {
diff --git a/src/fixers.rs b/src/fixers.rs
index dc6fd24..ed0df2c 100644
--- a/src/fixers.rs
+++ b/src/fixers.rs
@@ -3,8 +3,8 @@ use std::time::{Duration, Instant};
 use futures::prelude::*;
 use tokio::timer::Delay;
 
-use chunk::Chunk;
-use error::WebmetroError;
+use crate::chunk::Chunk;
+use crate::error::WebmetroError;
 
 pub struct ChunkTimecodeFixer<S> {
     stream: S,
diff --git a/src/iterator.rs b/src/iterator.rs
index ed5c2fd..a87f806 100644
--- a/src/iterator.rs
+++ b/src/iterator.rs
@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use ebml::FromEbml;
+use crate::ebml::FromEbml;
 
 pub struct EbmlIterator<'a, T: FromEbml<'a>>(&'a [u8], PhantomData<fn() -> T>);
 
diff --git a/src/lib.rs b/src/lib.rs
index b15d184..07246da 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ pub mod webm;
 
 pub mod channel;
 
-pub use ebml::{EbmlError, FromEbml};
+pub use crate::ebml::{EbmlError, FromEbml};
 
 #[cfg(test)]
 mod tests {
diff --git a/src/main.rs b/src/main.rs
index 454a058..b8fdcdd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -14,7 +14,7 @@ mod commands;
 
 use clap::{App, AppSettings};
 
-use commands::{
+use crate::commands::{
     relay,
     filter,
     send,
diff --git a/src/slice.rs b/src/slice.rs
index 9b1b547..8d621cf 100644
--- a/src/slice.rs
+++ b/src/slice.rs
@@ -1,8 +1,8 @@
 use futures::Async;
 
-use ebml::EbmlError;
-use ebml::EbmlEventSource;
-use ebml::FromEbml;
+use crate::ebml::EbmlError;
+use crate::ebml::EbmlEventSource;
+use crate::ebml::FromEbml;
 
 pub struct EbmlSlice<'a>(pub &'a [u8]);
 
diff --git a/src/stream_parser.rs b/src/stream_parser.rs
index 4dcf2fe..388f89c 100644
--- a/src/stream_parser.rs
+++ b/src/stream_parser.rs
@@ -8,11 +8,11 @@ use futures::{
     stream::Stream
 };
 
-use ebml::{
+use crate::ebml::{
     EbmlEventSource,
     FromEbml
 };
-use error::WebmetroError;
+use crate::error::WebmetroError;
 
 pub struct EbmlStreamingParser<S> {
     stream: S,
@@ -79,7 +79,7 @@ impl<I: Buf, S: Stream<Item = I, Error = WebmetroError>> EbmlStreamingParser<S>
                     self.buffer.put(buf);
                     // ok can retry decoding now
                 },
-                other => return other.map(|async| async.map(|_| None))
+                other => return other.map(|async_status| async_status.map(|_| None))
             }
         }
     }
diff --git a/src/webm.rs b/src/webm.rs
index 09d749c..40e9bca 100644
--- a/src/webm.rs
+++ b/src/webm.rs
@@ -1,8 +1,8 @@
 use std::io::{Cursor, Error as IoError, ErrorKind, Result as IoResult, Write, Seek};
 use bytes::{BigEndian, BufMut, ByteOrder};
-use ebml::*;
-use iterator::ebml_iter;
-use iterator::EbmlIterator;
+use crate::ebml::*;
+use crate::iterator::ebml_iter;
+use crate::iterator::EbmlIterator;
 
 const SEGMENT_ID: u64 = 0x08538067;
 const SEEK_HEAD_ID: u64 = 0x014D9B74;
@@ -131,11 +131,11 @@ pub fn encode_webm_element<T: Write + Seek>(element: WebmElement, output: &mut T
 
 #[cfg(test)]
 mod tests {
-    use tests::{
+    use crate::tests::{
         TEST_FILE,
         ENCODE_WEBM_TEST_FILE
     };
-    use webm::*;
+    use crate::webm::*;
 
     #[test]
     fn decode_webm_test1() {