Merge pull request #5454 from coolreader18/rust-1.83

Bump MSRV to 1.83
This commit is contained in:
Jeong, YunWon authored and GitHub committed 2025-01-07 13:13:42 +09:00
commit a5e6ade9cb
24 files changed
+75 -108

No files matched your search

+4 -8
View File
@@ -76,7 +76,7 @@ mod _sqlite {
ffi::{c_int, c_longlong, c_uint, c_void, CStr},
fmt::Debug,
ops::Deref,
ptr::{addr_of_mut, null, null_mut},
ptr::{null, null_mut},
thread::ThreadId,
};
@@ -1180,14 +1180,10 @@ mod _sqlite {
)
};
// TODO: replace with Result.inspect_err when stable
if let Err(exc) = db.check(ret, vm) {
db.check(ret, vm).inspect_err(|_| {
// create_collation do not call destructor if error occur
let _ = unsafe { Box::from_raw(data) };
Err(exc)
} else {
Ok(())
}
})
}
#[pymethod]
@@ -2398,7 +2394,7 @@ mod _sqlite {
let ret = unsafe {
sqlite3_open_v2(
path,
addr_of_mut!(db),
&raw mut db,
SQLITE_OPEN_READWRITE
| SQLITE_OPEN_CREATE
| if uri { SQLITE_OPEN_URI } else { 0 },