From 5a6f58acda92f948c2683357721aca209b8aca02 Mon Sep 17 00:00:00 2001 From: gwenn Date: Tue, 14 Mar 2023 19:43:50 +0100 Subject: [PATCH] Fix code related to bitflags --- src/inner_connection.rs | 8 ++++---- src/lib.rs | 1 + src/vtab/series.rs | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/inner_connection.rs b/src/inner_connection.rs index 18ce3db..275e846 100644 --- a/src/inner_connection.rs +++ b/src/inner_connection.rs @@ -69,13 +69,13 @@ impl InnerConnection { // Replicate the check for sane open flags from SQLite, because the check in // SQLite itself wasn't added until version 3.7.3. - debug_assert_eq!(1 << OpenFlags::SQLITE_OPEN_READ_ONLY.bits, 0x02); - debug_assert_eq!(1 << OpenFlags::SQLITE_OPEN_READ_WRITE.bits, 0x04); + debug_assert_eq!(1 << OpenFlags::SQLITE_OPEN_READ_ONLY.bits(), 0x02); + debug_assert_eq!(1 << OpenFlags::SQLITE_OPEN_READ_WRITE.bits(), 0x04); debug_assert_eq!( - 1 << (OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE).bits, + 1 << (OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE).bits(), 0x40 ); - if (1 << (flags.bits & 0x7)) & 0x46 == 0 { + if (1 << (flags.bits() & 0x7)) & 0x46 == 0 { return Err(Error::SqliteFailure( ffi::Error::new(ffi::SQLITE_MISUSE), None, diff --git a/src/lib.rs b/src/lib.rs index b0c42f4..1d982f6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1029,6 +1029,7 @@ bitflags::bitflags! { /// The default open flags are `SQLITE_OPEN_READ_WRITE | SQLITE_OPEN_CREATE /// | SQLITE_OPEN_URI | SQLITE_OPEN_NO_MUTEX`. See [`Connection::open`] for /// some discussion about these flags. + #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] #[repr(C)] pub struct OpenFlags: ::std::os::raw::c_int { /// The database is opened in read-only mode. diff --git a/src/vtab/series.rs b/src/vtab/series.rs index bb2a86f..4b1993e 100644 --- a/src/vtab/series.rs +++ b/src/vtab/series.rs @@ -28,6 +28,7 @@ const SERIES_COLUMN_STOP: c_int = 2; const SERIES_COLUMN_STEP: c_int = 3; bitflags::bitflags! { + #[derive(Clone, Copy)] #[repr(C)] struct QueryPlanFlags: ::std::os::raw::c_int { // start = $value -- constraint exists @@ -41,7 +42,7 @@ bitflags::bitflags! { // output in ascending order const ASC = 16; // Both start and stop - const BOTH = QueryPlanFlags::START.bits | QueryPlanFlags::STOP.bits; + const BOTH = QueryPlanFlags::START.bits() | QueryPlanFlags::STOP.bits(); } }