diff --git a/sqlx-core/src/cache.rs b/sqlx-core/src/cache.rs index 479b8078..a77e0d93 100644 --- a/sqlx-core/src/cache.rs +++ b/sqlx-core/src/cache.rs @@ -1,5 +1,5 @@ use std::collections::hash_map::{HashMap, Entry}; -use bitflags::_core::cmp::Ordering; +use std::cmp::Ordering; use futures_core::Future; pub struct StatementCache { diff --git a/sqlx-core/src/io/buf_stream.rs b/sqlx-core/src/io/buf_stream.rs index acde71b7..04e74407 100644 --- a/sqlx-core/src/io/buf_stream.rs +++ b/sqlx-core/src/io/buf_stream.rs @@ -2,7 +2,7 @@ use async_std::io::{ prelude::{ReadExt, WriteExt}, Read, Write, }; -use bitflags::_core::mem::MaybeUninit; +use std::mem::MaybeUninit; use std::io; pub struct BufStream { diff --git a/sqlx-core/src/mysql/executor.rs b/sqlx-core/src/mysql/executor.rs index a480c9fe..e23a1fd3 100644 --- a/sqlx-core/src/mysql/executor.rs +++ b/sqlx-core/src/mysql/executor.rs @@ -7,7 +7,7 @@ use crate::{backend::Backend, describe::{Describe, ResultField}, executor::Execu query::MySqlDbParameters, }, params::{IntoQueryParameters, QueryParameters}, row::FromRow, url::Url, Error}; use futures_core::{future::BoxFuture, stream::BoxStream, Future}; -use bitflags::_core::pin::Pin; +use std::pin::Pin; impl Connection { async fn prepare_cached(&mut self, query: &str) -> crate::Result { diff --git a/sqlx-core/src/pool/executor.rs b/sqlx-core/src/pool/executor.rs index af71173d..88d14bb7 100644 --- a/sqlx-core/src/pool/executor.rs +++ b/sqlx-core/src/pool/executor.rs @@ -1,7 +1,7 @@ use crate::{backend::Backend, describe::Describe, executor::Executor, params::IntoQueryParameters, pool::Pool, row::FromRow, Error}; use futures_core::{future::BoxFuture, stream::BoxStream, Future}; use futures_util::StreamExt; -use bitflags::_core::pin::Pin; +use std::pin::Pin; impl Executor for Pool where diff --git a/sqlx-core/src/postgres/executor.rs b/sqlx-core/src/postgres/executor.rs index 801bbdf4..bb05b7d7 100644 --- a/sqlx-core/src/postgres/executor.rs +++ b/sqlx-core/src/postgres/executor.rs @@ -2,7 +2,7 @@ use super::{connection::Step, Connection, Postgres}; use crate::{backend::Backend, describe::{Describe, ResultField}, executor::Executor, params::{IntoQueryParameters, QueryParameters}, row::FromRow, url::Url, Error}; use futures_core::{future::BoxFuture, stream::BoxStream, Future}; use crate::postgres::query::PostgresQueryParameters; -use bitflags::_core::pin::Pin; +use std::pin::Pin; impl Connection { async fn prepare_cached(&mut self, query: &str, params: &PostgresQueryParameters) -> crate::Result { diff --git a/sqlx-core/src/postgres/mod.rs b/sqlx-core/src/postgres/mod.rs index 01459910..c5d96139 100644 --- a/sqlx-core/src/postgres/mod.rs +++ b/sqlx-core/src/postgres/mod.rs @@ -4,7 +4,7 @@ use crate::{Error, Backend}; use futures_core::Future; use futures_core::future::BoxFuture; use std::net::SocketAddr; -use bitflags::_core::pin::Pin; +use std::pin::Pin; mod backend; mod connection; diff --git a/sqlx-core/src/query.rs b/sqlx-core/src/query.rs index d6065ecf..4cd4598b 100644 --- a/sqlx-core/src/query.rs +++ b/sqlx-core/src/query.rs @@ -1,5 +1,5 @@ use crate::{backend::Backend, encode::Encode, error::Error, executor::Executor, params::{IntoQueryParameters, QueryParameters}, row::FromRow, types::HasSqlType, Row, Decode}; -use bitflags::_core::marker::PhantomData; +use std::marker::PhantomData; use futures_core::{future::BoxFuture, stream::BoxStream}; pub struct Query<'q, DB, P = ::QueryParameters, R = ::Row>