Move the Tinyint type from ::mysql::data_types to ::types

The data_types module should only be for types that don't have a rust
primitive type to be mapped to.

Author: Eijebong

diesel/src/mysql/mod.rs

@@ -7,7 +7,3 @@ pub mod types;
 pub use self::backend::{Mysql, MysqlType};
 pub use self::connection::MysqlConnection;
 pub use self::query_builder::MysqlQueryBuilder;
-pub mod data_types {
-    #[doc(inline)]
-    pub use super::types::Tinyint;
-}

diesel/src/mysql/types/mod.rs

@@ -1,42 +1,29 @@
-use byteorder::WriteBytesExt;
 #[cfg(feature = "chrono")]
 mod date_and_time;
 
+use byteorder::WriteBytesExt;
 use mysql::{Mysql, MysqlType};
 use std::error::Error as StdError;
 use std::io::Write;
-use types::{self, ToSql, IsNull, FromSql, HasSqlType};
+use types::{ToSql, IsNull, FromSql, HasSqlType};
 
-/// The tinyint SQL type. This is only available on MySQL.
-///
-/// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls
-///
-/// - [`i8`][i8]
-///
-/// ### [`FromSql`](/diesel/types/trait.FromSql.html) impls
-///
-/// - [`i8`][i8]
-///
-/// [i8]: https://doc.rust-lang.org/nightly/std/primitive.i8.html
-#[derive(Debug, Clone, Copy, Default)] pub struct Tinyint;
+primitive_impls!(Tinyint -> (i8, mysql: (Tiny)));
 
-impl ToSql<Tinyint, Mysql> for i8 {
+impl ToSql<::types::Tinyint, Mysql> for i8 {
     fn to_sql<W: Write>(&self, out: &mut W) -> Result<IsNull, Box<StdError+Send+Sync>> {
         out.write_i8(*self)
             .map(|_| IsNull::No)
             .map_err(|e| Box::new(e) as Box<StdError+Send+Sync>)
     }
 }
 
-impl FromSql<types::Tinyint, Mysql> for i8 {
+impl FromSql<::types::Tinyint, Mysql> for i8 {
     fn from_sql(bytes: Option<&[u8]>) -> Result<Self, Box<StdError+Send+Sync>> {
         let bytes = not_none!(bytes);
         Ok(bytes[0] as i8)
     }
 }
 
-primitive_impls!(Tinyint -> (i8, mysql: (Tiny)));
-
 impl ToSql<::types::Bool, Mysql> for bool {
     fn to_sql<W: Write>(&self, out: &mut W) -> Result<IsNull, Box<StdError+Send+Sync>> {
         let int_value = if *self {

diesel/src/types/mod.rs

@@ -31,9 +31,6 @@ pub mod structs {
         //! backend.
         #[cfg(feature = "postgres")]
         pub use pg::data_types::*;
-
-        #[cfg(feature = "mysql")]
-        pub use mysql::data_types::*;
     }
 }
 
@@ -61,6 +58,19 @@ use std::io::Write;
 /// [bool]: https://doc.rust-lang.org/nightly/std/primitive.bool.html
 #[derive(Debug, Clone, Copy, Default)] pub struct Bool;
 
+/// The tinyint SQL type. This is only available on MySQL.
+///
+/// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls
+///
+/// - [`i8`][i8]
+///
+/// ### [`FromSql`](/diesel/types/trait.FromSql.html) impls
+///
+/// - [`i8`][i8]
+///
+/// [i8]: https://doc.rust-lang.org/nightly/std/primitive.i8.html
+#[derive(Debug, Clone, Copy, Default)] pub struct Tinyint;
+
 /// The small integer SQL type.
 ///
 /// ### [`ToSql`](/diesel/types/trait.ToSql.html) impls