ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-10-31 05:48:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Unnecessary path prefix

Browse Source
This commit is contained in:
gwenn
2024-10-27 14:20:40 +01:00
parent 4ec54f1a12
commit da7e87f62e
11 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsqlite3-sys/src/error.rs
View File

@@ -285,8 +285,8 @@ pub enum InitError {
NullFunctionPointer,
}
#[cfg(feature = "loadable_extension")]
impl ::std::fmt::Display for InitError {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
impl fmt::Display for InitError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Self::VersionMismatch {
compile_time,

2
src/error.rs
View File

@@ -452,7 +452,7 @@ pub unsafe fn error_with_offset(db: *mut ffi::sqlite3, code: c_int, sql: &str) -
}
pub fn check(code: c_int) -> Result<()> {
if code != crate::ffi::SQLITE_OK {
if code != ffi::SQLITE_OK {
Err(error_from_sqlite_code(code, None))
} else {
Ok(())

6
src/functions.rs
View File

@@ -368,7 +368,7 @@ bitflags::bitflags! {
/// and [Function Flags](https://sqlite.org/c3ref/c_deterministic.html) for details.
#[derive(Clone, Copy, Debug)]
#[repr(C)]
pub struct FunctionFlags: ::std::os::raw::c_int {
pub struct FunctionFlags: c_int {
/// Specifies UTF-8 as the text encoding this SQL function prefers for its parameters.
const SQLITE_UTF8 = ffi::SQLITE_UTF8;
/// Specifies UTF-16 using little-endian byte order as the text encoding this SQL function prefers for its parameters.
@@ -693,7 +693,7 @@ unsafe extern "C" fn call_boxed_step<A, D, T>(
D: Aggregate<A, T>,
T: SqlFnOutput,
{
let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) else {
let Some(pac) = aggregate_context(ctx, size_of::<*mut A>()) else {
ffi::sqlite3_result_error_nomem(ctx);
return;
};
@@ -739,7 +739,7 @@ unsafe extern "C" fn call_boxed_inverse<A, W, T>(
W: WindowAggregate<A, T>,
T: SqlFnOutput,
{
let Some(pac) = aggregate_context(ctx, std::mem::size_of::<*mut A>()) else {
let Some(pac) = aggregate_context(ctx, size_of::<*mut A>()) else {
ffi::sqlite3_result_error_nomem(ctx);
return;
};

2
src/inner_connection.rs
View File

@@ -34,7 +34,7 @@ pub struct InnerConnection {
#[cfg(feature = "hooks")]
pub authorizer: Option<crate::hooks::BoxedAuthorizer>,
#[cfg(feature = "preupdate_hook")]
pub free_preupdate_hook: Option<unsafe fn(*mut ::std::os::raw::c_void)>,
pub free_preupdate_hook: Option<unsafe fn(*mut std::os::raw::c_void)>,
owned: bool,
}

2
src/lib.rs
View File

@@ -1169,7 +1169,7 @@ bitflags::bitflags! {
/// some discussion about these flags.
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
#[repr(C)]
pub struct OpenFlags: ::std::os::raw::c_int {
pub struct OpenFlags: c_int {
/// The database is opened in read-only mode.
/// If the database does not already exist, an error is returned.
const SQLITE_OPEN_READ_ONLY = ffi::SQLITE_OPEN_READONLY;

2
src/session.rs
View File

@@ -333,7 +333,7 @@ impl ChangesetIter<'_> {
}
impl FallibleStreamingIterator for ChangesetIter<'_> {
type Error = crate::error::Error;
type Error = Error;
type Item = ChangesetItem;
#[inline]

8
src/types/time.rs
View File

@@ -1,8 +1,8 @@
//! Convert formats 1-10 in [Time Values](https://sqlite.org/lang_datefunc.html#time_values) to time types.
//! [`ToSql`] and [`FromSql`] implementation for [`time::OffsetDateTime`].
//! [`ToSql`] and [`FromSql`] implementation for [`time::PrimitiveDateTime`].
//! [`ToSql`] and [`FromSql`] implementation for [`time::Date`].
//! [`ToSql`] and [`FromSql`] implementation for [`time::Time`].
//! [`ToSql`] and [`FromSql`] implementation for [`OffsetDateTime`].
//! [`ToSql`] and [`FromSql`] implementation for [`PrimitiveDateTime`].
//! [`ToSql`] and [`FromSql`] implementation for [`Date`].
//! [`ToSql`] and [`FromSql`] implementation for [`Time`].
//! Time Strings in:
//! - Format 2: "YYYY-MM-DD HH:MM"
//! - Format 5: "YYYY-MM-DDTHH:MM"

6
src/types/to_sql.rs
View File

@@ -445,7 +445,7 @@ mod test {
#[cfg(feature = "i128_blob")]
#[test]
fn test_i128() -> crate::Result<()> {
fn test_i128() -> Result<()> {
use crate::Connection;
let db = Connection::open_in_memory()?;
db.execute_batch("CREATE TABLE foo (i128 BLOB, desc TEXT)")?;
@@ -484,7 +484,7 @@ mod test {
#[cfg(feature = "i128_blob")]
#[test]
fn test_non_zero_i128() -> crate::Result<()> {
fn test_non_zero_i128() -> Result<()> {
use std::num::NonZeroI128;
macro_rules! nz {
($x:expr) => {
@@ -532,7 +532,7 @@ mod test {
#[cfg(feature = "uuid")]
#[test]
fn test_uuid() -> crate::Result<()> {
fn test_uuid() -> Result<()> {
use crate::{params, Connection};
use uuid::Uuid;

2
src/types/url.rs
View File

@@ -1,4 +1,4 @@
//! [`ToSql`] and [`FromSql`] implementation for [`url::Url`].
//! [`ToSql`] and [`FromSql`] implementation for [`Url`].
use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
use crate::Result;
use url::Url;

44
src/vtab/mod.rs
View File

@@ -87,7 +87,7 @@ unsafe impl<'vtab, T: VTab<'vtab>> Send for Module<'vtab, T> {}
unsafe impl<'vtab, T: VTab<'vtab>> Sync for Module<'vtab, T> {}
union ModuleZeroHack {
bytes: [u8; std::mem::size_of::<ffi::sqlite3_module>()],
bytes: [u8; size_of::<ffi::sqlite3_module>()],
module: ffi::sqlite3_module,
}
@@ -96,7 +96,7 @@ union ModuleZeroHack {
// structs are allowed to be zeroed.
const ZERO_MODULE: ffi::sqlite3_module = unsafe {
ModuleZeroHack {
bytes: [0_u8; std::mem::size_of::<ffi::sqlite3_module>()],
bytes: [0_u8; size_of::<ffi::sqlite3_module>()],
}
.module
};
@@ -372,7 +372,7 @@ bitflags::bitflags! {
/// See [Function Flags](https://sqlite.org/c3ref/c_index_scan_unique.html) for details.
#[repr(C)]
#[derive(Copy, Clone, Debug)]
pub struct IndexFlags: ::std::os::raw::c_int {
pub struct IndexFlags: c_int {
/// Default
const NONE = 0;
/// Scan visits at most 1 row.
@@ -940,7 +940,7 @@ unsafe extern "C" fn rust_create<'vtab, T>(
aux: *mut c_void,
argc: c_int,
argv: *const *const c_char,
pp_vtab: *mut *mut ffi::sqlite3_vtab,
pp_vtab: *mut *mut sqlite3_vtab,
err_msg: *mut *mut c_char,
) -> c_int
where
@@ -961,7 +961,7 @@ where
let rc = ffi::sqlite3_declare_vtab(db, c_sql.as_ptr());
if rc == ffi::SQLITE_OK {
let boxed_vtab: *mut T = Box::into_raw(Box::new(vtab));
*pp_vtab = boxed_vtab.cast::<ffi::sqlite3_vtab>();
*pp_vtab = boxed_vtab.cast::<sqlite3_vtab>();
ffi::SQLITE_OK
} else {
let err = error_from_sqlite_code(rc, None);
@@ -982,7 +982,7 @@ unsafe extern "C" fn rust_connect<'vtab, T>(
aux: *mut c_void,
argc: c_int,
argv: *const *const c_char,
pp_vtab: *mut *mut ffi::sqlite3_vtab,
pp_vtab: *mut *mut sqlite3_vtab,
err_msg: *mut *mut c_char,
) -> c_int
where
@@ -1003,7 +1003,7 @@ where
let rc = ffi::sqlite3_declare_vtab(db, c_sql.as_ptr());
if rc == ffi::SQLITE_OK {
let boxed_vtab: *mut T = Box::into_raw(Box::new(vtab));
*pp_vtab = boxed_vtab.cast::<ffi::sqlite3_vtab>();
*pp_vtab = boxed_vtab.cast::<sqlite3_vtab>();
ffi::SQLITE_OK
} else {
let err = error_from_sqlite_code(rc, None);
@@ -1020,7 +1020,7 @@ where
}
unsafe extern "C" fn rust_best_index<'vtab, T>(
vtab: *mut ffi::sqlite3_vtab,
vtab: *mut sqlite3_vtab,
info: *mut ffi::sqlite3_index_info,
) -> c_int
where
@@ -1043,7 +1043,7 @@ where
}
}
unsafe extern "C" fn rust_disconnect<'vtab, T>(vtab: *mut ffi::sqlite3_vtab) -> c_int
unsafe extern "C" fn rust_disconnect<'vtab, T>(vtab: *mut sqlite3_vtab) -> c_int
where
T: VTab<'vtab>,
{
@@ -1055,7 +1055,7 @@ where
ffi::SQLITE_OK
}
unsafe extern "C" fn rust_destroy<'vtab, T>(vtab: *mut ffi::sqlite3_vtab) -> c_int
unsafe extern "C" fn rust_destroy<'vtab, T>(vtab: *mut sqlite3_vtab) -> c_int
where
T: CreateVTab<'vtab>,
{
@@ -1082,8 +1082,8 @@ where
}
unsafe extern "C" fn rust_open<'vtab, T>(
vtab: *mut ffi::sqlite3_vtab,
pp_cursor: *mut *mut ffi::sqlite3_vtab_cursor,
vtab: *mut sqlite3_vtab,
pp_cursor: *mut *mut sqlite3_vtab_cursor,
) -> c_int
where
T: VTab<'vtab> + 'vtab,
@@ -1092,7 +1092,7 @@ where
match (*vt).open() {
Ok(cursor) => {
let boxed_cursor: *mut T::Cursor = Box::into_raw(Box::new(cursor));
*pp_cursor = boxed_cursor.cast::<ffi::sqlite3_vtab_cursor>();
*pp_cursor = boxed_cursor.cast::<sqlite3_vtab_cursor>();
ffi::SQLITE_OK
}
Err(Error::SqliteFailure(err, s)) => {
@@ -1108,7 +1108,7 @@ where
}
}
unsafe extern "C" fn rust_close<C>(cursor: *mut ffi::sqlite3_vtab_cursor) -> c_int
unsafe extern "C" fn rust_close<C>(cursor: *mut sqlite3_vtab_cursor) -> c_int
where
C: VTabCursor,
{
@@ -1118,7 +1118,7 @@ where
}
unsafe extern "C" fn rust_filter<C>(
cursor: *mut ffi::sqlite3_vtab_cursor,
cursor: *mut sqlite3_vtab_cursor,
idx_num: c_int,
idx_str: *const c_char,
argc: c_int,
@@ -1141,7 +1141,7 @@ where
cursor_error(cursor, (*cr).filter(idx_num, idx_name, &values))
}
unsafe extern "C" fn rust_next<C>(cursor: *mut ffi::sqlite3_vtab_cursor) -> c_int
unsafe extern "C" fn rust_next<C>(cursor: *mut sqlite3_vtab_cursor) -> c_int
where
C: VTabCursor,
{
@@ -1149,7 +1149,7 @@ where
cursor_error(cursor, (*cr).next())
}
unsafe extern "C" fn rust_eof<C>(cursor: *mut ffi::sqlite3_vtab_cursor) -> c_int
unsafe extern "C" fn rust_eof<C>(cursor: *mut sqlite3_vtab_cursor) -> c_int
where
C: VTabCursor,
{
@@ -1158,7 +1158,7 @@ where
}
unsafe extern "C" fn rust_column<C>(
cursor: *mut ffi::sqlite3_vtab_cursor,
cursor: *mut sqlite3_vtab_cursor,
ctx: *mut ffi::sqlite3_context,
i: c_int,
) -> c_int
@@ -1171,7 +1171,7 @@ where
}
unsafe extern "C" fn rust_rowid<C>(
cursor: *mut ffi::sqlite3_vtab_cursor,
cursor: *mut sqlite3_vtab_cursor,
p_rowid: *mut ffi::sqlite3_int64,
) -> c_int
where
@@ -1188,7 +1188,7 @@ where
}
unsafe extern "C" fn rust_update<'vtab, T>(
vtab: *mut ffi::sqlite3_vtab,
vtab: *mut sqlite3_vtab,
argc: c_int,
argv: *mut *mut ffi::sqlite3_value,
p_rowid: *mut ffi::sqlite3_int64,
@@ -1233,7 +1233,7 @@ where
/// Virtual table cursors can set an error message by assigning a string to
/// `zErrMsg`.
#[cold]
unsafe fn cursor_error<T>(cursor: *mut ffi::sqlite3_vtab_cursor, result: Result<T>) -> c_int {
unsafe fn cursor_error<T>(cursor: *mut sqlite3_vtab_cursor, result: Result<T>) -> c_int {
match result {
Ok(_) => ffi::SQLITE_OK,
Err(Error::SqliteFailure(err, s)) => {
@@ -1252,7 +1252,7 @@ unsafe fn cursor_error<T>(cursor: *mut ffi::sqlite3_vtab_cursor, result: Result<
/// Virtual tables methods can set an error message by assigning a string to
/// `zErrMsg`.
#[cold]
unsafe fn set_err_msg(vtab: *mut ffi::sqlite3_vtab, err_msg: &str) {
unsafe fn set_err_msg(vtab: *mut sqlite3_vtab, err_msg: &str) {
if !(*vtab).zErrMsg.is_null() {
ffi::sqlite3_free((*vtab).zErrMsg.cast::<c_void>());
}

2
src/vtab/series.rs
View File

@@ -29,7 +29,7 @@ const SERIES_COLUMN_STEP: c_int = 3;
bitflags::bitflags! {
#[derive(Clone, Copy)]
#[repr(C)]
struct QueryPlanFlags: ::std::os::raw::c_int {
struct QueryPlanFlags: c_int {
// start = $value -- constraint exists
const START = 1;
// stop = $value -- constraint exists