mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-08-04 11:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix assertion for same DB in DbGuard

Browse source
This commit is contained in:
Micha Reiser 2024-07-26 11:26:19 +02:00
parent e4ce917f6e
commit 18faece05e
No known key found for this signature in database
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/local_state.rs
View file

@ -83,12 +83,16 @@ impl LocalState {
impl<'s> DbGuard<'s> { impl<'s> DbGuard<'s> {
fn new(state: &'s LocalState, db: &dyn Database) -> Self { fn new(state: &'s LocalState, db: &dyn Database) -> Self {
if let Some(current_db) = state.database.get() { if let Some(current_db) = state.database.get() {
let new_db = NonNull::from(db);
// Already attached? Assert that the database has not changed. // Already attached? Assert that the database has not changed.
assert_eq!( // NOTE: It's important to use `addr_eq` here because `NonNull` not only compares the address but also the type's metadata.
current_db, if !std::ptr::addr_eq(current_db.as_ptr(), new_db.as_ptr()) {
NonNull::from(db), panic!(
"cannot change database mid-query", "Cannot change database mid-query. current: {current_db:?}, new: {new_db:?}",
); );
}
Self { state: None } Self { state: None }
} else { } else {
// Otherwise, set the database. // Otherwise, set the database.