mirrors/salsa
1
0
Fork 0
mirror of https://github.com/salsa-rs/salsa.git synced 2025-01-23 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use InternIndex also to represent indices from the user

Browse source
This commit is contained in:
Niko Matsakis 2019-03-13 05:18:23 -04:00
parent 71f250d037
commit 7ed24f0fa3
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/interned.rs
View file

@ -90,6 +90,9 @@ impl InternKey for usize {
} }
/// Newtype indicating an index into the intern table. /// Newtype indicating an index into the intern table.
///
/// NB. In some cases, `InternIndex` values come directly from the
/// user and hence they are not 'trusted' to be valid or in-bounds.
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)] #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
struct InternIndex { struct InternIndex {
index: u32, index: u32,
@ -103,8 +106,16 @@ impl InternIndex {
impl From<usize> for InternIndex { impl From<usize> for InternIndex {
fn from(v: usize) -> Self { fn from(v: usize) -> Self {
assert!(v < (std::u32::MAX as usize)); InternIndex { index: v.as_u32() }
InternIndex { index: v as u32 } }
}
impl<T> From<&T> for InternIndex
where
T: InternKey,
{
fn from(v: &T) -> Self {
InternIndex { index: v.as_u32() }
} }
} }
@ -345,10 +356,10 @@ where
fn lookup_value<R>( fn lookup_value<R>(
&self, &self,
db: &DB, db: &DB,
index: u32, index: InternIndex,
op: impl FnOnce(&Q::Key) -> R, op: impl FnOnce(&Q::Key) -> R,
) -> StampedValue<R> { ) -> StampedValue<R> {
let index = index as usize; let index = index.index();
let revision_now = db.salsa_runtime().current_revision(); let revision_now = db.salsa_runtime().current_revision();
{ {
@ -514,7 +525,7 @@ where
key: &Q::Key, key: &Q::Key,
database_key: &DB::DatabaseKey, database_key: &DB::DatabaseKey,
) -> Result<Q::Value, CycleDetected> { ) -> Result<Q::Value, CycleDetected> {
let index: u32 = key.as_u32(); let index = InternIndex::from(key);
let group_storage = <DB as HasQueryGroup<Q::Group>>::group_storage(db); let group_storage = <DB as HasQueryGroup<Q::Group>>::group_storage(db);
let interned_storage = IQ::query_storage(group_storage); let interned_storage = IQ::query_storage(group_storage);
@ -534,7 +545,7 @@ where
key: &Q::Key, key: &Q::Key,
_database_key: &DB::DatabaseKey, _database_key: &DB::DatabaseKey,
) -> bool { ) -> bool {
let index: u32 = key.as_u32(); let index = InternIndex::from(key);
// FIXME -- This seems maybe not quite right, as it will panic // FIXME -- This seems maybe not quite right, as it will panic
// if `key` has been removed from the map since, but it should // if `key` has been removed from the map since, but it should