From 9629a1fa951e721c7364b113bf6736493ab2aaf9 Mon Sep 17 00:00:00 2001
From: Ryan Leckey <ryan@launchbadge.com>
Date: Thu, 29 Aug 2019 00:30:25 -0700
Subject: [PATCH] Tweak error_codes and types so they compile

---
 src/mariadb/protocol/error_codes.rs | 4 ----
 src/mariadb/protocol/types.rs       | 8 +++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mariadb/protocol/error_codes.rs b/src/mariadb/protocol/error_codes.rs
index b1f3bcd7..0a1080dc 100644
--- a/src/mariadb/protocol/error_codes.rs
+++ b/src/mariadb/protocol/error_codes.rs
@@ -1,7 +1,3 @@
-use std::convert::TryFrom;
-
-// FIXME: Remove Default
-
 #[derive(Default, Debug)]
 pub struct ErrorCode(pub(crate) u16);
 
diff --git a/src/mariadb/protocol/types.rs b/src/mariadb/protocol/types.rs
index 8967ee6c..51b58d2f 100644
--- a/src/mariadb/protocol/types.rs
+++ b/src/mariadb/protocol/types.rs
@@ -3,7 +3,7 @@ pub enum ProtocolType {
     Binary,
 }
 
-bitflags! {
+bitflags::bitflags! {
     pub struct Capabilities: u128 {
         const CLIENT_MYSQL = 1;
         const FOUND_ROWS = 1 << 1;
@@ -30,7 +30,7 @@ bitflags! {
     }
 }
 
-bitflags! {
+bitflags::bitflags! {
     pub struct FieldDetailFlag: u16 {
         const NOT_NULL = 1;
         const PRIMARY_KEY = 2;
@@ -50,7 +50,7 @@ bitflags! {
     }
 }
 
-bitflags! {
+bitflags::bitflags! {
     pub struct ServerStatusFlag: u16 {
         const SERVER_STATUS_IN_TRANS = 1;
         const SERVER_STATUS_AUTOCOMMIT = 2;
@@ -130,6 +130,8 @@ impl ParamFlag {
     pub const UNSIGNED: ParamFlag = ParamFlag(128);
 }
 
+// TODO: Remove these Default impls
+
 impl Default for Capabilities {
     fn default() -> Self {
         Capabilities::CLIENT_PROTOCOL_41