Tweak error_codes and types so they compile

This commit is contained in:
Ryan Leckey 2019-08-29 00:30:25 -07:00
parent cbd56f3fa9
commit 9629a1fa95
2 changed files with 5 additions and 7 deletions

View File

@ -1,7 +1,3 @@
use std::convert::TryFrom;
// FIXME: Remove Default
#[derive(Default, Debug)]
pub struct ErrorCode(pub(crate) u16);

View File

@ -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