From 2d4c1eec4dab48f325fd60f63eaadd0f44d3a33e Mon Sep 17 00:00:00 2001
From: Zrzka <zrzka@users.noreply.github.com>
Date: Fri, 13 Sep 2019 23:33:04 +0200
Subject: [PATCH] namespace reformat, 2018 style, warnings  (#210)

---
 crossterm_terminal/examples/terminal.rs       |  3 +--
 crossterm_terminal/src/lib.rs                 | 10 ---------
 crossterm_terminal/src/sys/mod.rs             | 10 ++++-----
 .../src/terminal/ansi_terminal.rs             | 11 ++++++----
 crossterm_terminal/src/terminal/mod.rs        | 21 +++++++++----------
 crossterm_terminal/src/terminal/terminal.rs   | 14 ++++++-------
 .../src/terminal/winapi_terminal.rs           |  6 ++++--
 7 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/crossterm_terminal/examples/terminal.rs b/crossterm_terminal/examples/terminal.rs
index 68b8668..20b586c 100644
--- a/crossterm_terminal/examples/terminal.rs
+++ b/crossterm_terminal/examples/terminal.rs
@@ -1,8 +1,7 @@
 //!
 //! Terminal Examples
 //!
-extern crate crossterm_cursor;
-extern crate crossterm_terminal;
+#![allow(unused_must_use)]
 
 use crossterm_cursor::cursor;
 use crossterm_terminal::{terminal, ClearType};
diff --git a/crossterm_terminal/src/lib.rs b/crossterm_terminal/src/lib.rs
index b073758..8eb62fc 100644
--- a/crossterm_terminal/src/lib.rs
+++ b/crossterm_terminal/src/lib.rs
@@ -1,13 +1,3 @@
-#[macro_use]
-extern crate crossterm_utils;
-extern crate crossterm_cursor;
-
-#[cfg(windows)]
-extern crate crossterm_winapi;
-
-#[cfg(unix)]
-extern crate libc;
-
 mod sys;
 mod terminal;
 
diff --git a/crossterm_terminal/src/sys/mod.rs b/crossterm_terminal/src/sys/mod.rs
index 2d71118..26b1553 100644
--- a/crossterm_terminal/src/sys/mod.rs
+++ b/crossterm_terminal/src/sys/mod.rs
@@ -1,10 +1,10 @@
+#[cfg(unix)]
+pub use self::unix::{exit, get_terminal_size};
+#[cfg(windows)]
+pub use self::winapi::{exit, get_terminal_size};
+
 #[cfg(windows)]
 pub mod winapi;
 
 #[cfg(unix)]
 pub mod unix;
-
-#[cfg(unix)]
-pub use self::unix::{exit, get_terminal_size};
-#[cfg(windows)]
-pub use self::winapi::{exit, get_terminal_size};
diff --git a/crossterm_terminal/src/terminal/ansi_terminal.rs b/crossterm_terminal/src/terminal/ansi_terminal.rs
index 53de183..d9c502b 100644
--- a/crossterm_terminal/src/terminal/ansi_terminal.rs
+++ b/crossterm_terminal/src/terminal/ansi_terminal.rs
@@ -1,12 +1,15 @@
 //! This is an `ANSI escape code` specific implementation for terminal related action.
 //! This module is used for windows 10 terminals and unix terminals by default.
 
-use super::ITerminal;
-use crate::{sys::get_terminal_size, ClearType};
-use crossterm_cursor::TerminalCursor;
-use crossterm_utils::Result;
 use std::io::Write;
 
+use crossterm_cursor::TerminalCursor;
+use crossterm_utils::{csi, write_cout, Result};
+
+use crate::{sys::get_terminal_size, ClearType};
+
+use super::ITerminal;
+
 pub static CLEAR_ALL: &'static str = csi!("2J");
 pub static CLEAR_FROM_CURSOR_DOWN: &'static str = csi!("J");
 pub static CLEAR_FROM_CURSOR_UP: &'static str = csi!("1J");
diff --git a/crossterm_terminal/src/terminal/mod.rs b/crossterm_terminal/src/terminal/mod.rs
index de17067..43d217b 100644
--- a/crossterm_terminal/src/terminal/mod.rs
+++ b/crossterm_terminal/src/terminal/mod.rs
@@ -1,4 +1,14 @@
 //! A module that contains all the actions related to the terminal. like clearing, resizing, pausing and scrolling the terminal.
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+use crossterm_utils::Result;
+
+use self::ansi_terminal::AnsiTerminal;
+pub use self::terminal::{terminal, Clear, ScrollDown, ScrollUp, SetSize, Terminal};
+#[cfg(windows)]
+use self::winapi_terminal::WinApiTerminal;
+
 #[cfg(test)]
 mod test;
 
@@ -8,17 +18,6 @@ mod ansi_terminal;
 #[cfg(windows)]
 mod winapi_terminal;
 
-use self::ansi_terminal::AnsiTerminal;
-#[cfg(windows)]
-use self::winapi_terminal::WinApiTerminal;
-
-pub use self::terminal::{terminal, Clear, ScrollDown, ScrollUp, SetSize, Terminal};
-
-use crossterm_utils::Result;
-
-#[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
 /// Enum with the different values to clear the terminal.
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)]
diff --git a/crossterm_terminal/src/terminal/terminal.rs b/crossterm_terminal/src/terminal/terminal.rs
index 6a1cdc5..9b97ca4 100644
--- a/crossterm_terminal/src/terminal/terminal.rs
+++ b/crossterm_terminal/src/terminal/terminal.rs
@@ -1,16 +1,16 @@
 //! A module that contains all the actions related to the terminal.
 //! Like clearing and scrolling in the terminal or getting the window size from the terminal.
 
-use super::{AnsiTerminal, ClearType, ITerminal};
-use crossterm_utils::{Command, Result};
+use std::fmt;
+use std::io::Write;
+
+#[cfg(windows)]
+use crossterm_utils::supports_ansi;
+use crossterm_utils::{impl_display, write_cout, Command, Result};
 
 #[cfg(windows)]
 use super::WinApiTerminal;
-#[cfg(windows)]
-use crossterm_utils::supports_ansi;
-
-use std::fmt;
-use std::io::Write;
+use super::{AnsiTerminal, ClearType, ITerminal};
 
 /// Allows you to preform actions on the terminal.
 ///
diff --git a/crossterm_terminal/src/terminal/winapi_terminal.rs b/crossterm_terminal/src/terminal/winapi_terminal.rs
index c1f3823..d38a086 100644
--- a/crossterm_terminal/src/terminal/winapi_terminal.rs
+++ b/crossterm_terminal/src/terminal/winapi_terminal.rs
@@ -3,12 +3,14 @@
 //!
 //! Windows versions lower then windows 10 are not supporting ANSI codes. Those versions will use this implementation instead.
 
-use super::*;
-use crate::sys::winapi::get_terminal_size;
 use crossterm_cursor::sys::winapi::Cursor;
 use crossterm_utils::{ErrorKind, Result};
 use crossterm_winapi::{Console, Coord, Handle, ScreenBuffer, Size};
 
+use crate::sys::winapi::get_terminal_size;
+
+use super::*;
+
 /// This struct is a winapi implementation for terminal related actions.
 pub struct WinApiTerminal;