diff --git a/components/salsa-2022/src/function/memo.rs b/components/salsa-2022/src/function/memo.rs index 4959488a..c0e7ac2c 100644 --- a/components/salsa-2022/src/function/memo.rs +++ b/components/salsa-2022/src/function/memo.rs @@ -42,18 +42,6 @@ impl MemoMap { pub(super) fn get(&self, key: K) -> Option>>> { self.map.get(&key).map(|v| v.load()) } - - /// Iterates over the entries in the map. This holds a read lock while iteration continues. - pub(super) fn iter(&self) -> impl Iterator>)> + '_ { - self.map - .iter() - .map(move |r| (*r.key(), r.value().load_full())) - } - - /// Clears the memo of all entries. - pub(super) fn clear(&self) { - self.map.clear() - } } #[derive(Debug)] diff --git a/components/salsa-2022/src/key.rs b/components/salsa-2022/src/key.rs index 388d8e69..9710f0c9 100644 --- a/components/salsa-2022/src/key.rs +++ b/components/salsa-2022/src/key.rs @@ -38,7 +38,7 @@ impl crate::debug::DebugWithDb for DependencyIndex where Db: ?Sized + Database, { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>, db: &Db) -> std::fmt::Result { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>, _db: &Db) -> std::fmt::Result { write!(f, "{:?}", *self) // FIXME } } diff --git a/components/salsa-2022/src/revision.rs b/components/salsa-2022/src/revision.rs index d1f6a3f9..a98a4585 100644 --- a/components/salsa-2022/src/revision.rs +++ b/components/salsa-2022/src/revision.rs @@ -60,11 +60,4 @@ impl AtomicRevision { pub(crate) fn store(&self, r: Revision) { self.data.store(r.as_usize(), Ordering::SeqCst); } - - /// Increment by 1, returning previous value. - pub(crate) fn fetch_then_increment(&self) -> Revision { - let v = self.data.fetch_add(1, Ordering::SeqCst); - assert!(v != usize::max_value(), "revision overflow"); - Revision::from(v) - } } diff --git a/components/salsa-2022/src/runtime/active_query.rs b/components/salsa-2022/src/runtime/active_query.rs index db4c7d1b..142268d9 100644 --- a/components/salsa-2022/src/runtime/active_query.rs +++ b/components/salsa-2022/src/runtime/active_query.rs @@ -2,7 +2,7 @@ use std::collections::BTreeSet; use crate::{ durability::Durability, - hash::{FxHashSet, FxIndexMap, FxIndexSet}, + hash::{FxIndexMap, FxIndexSet}, key::{DatabaseKeyIndex, DependencyIndex}, tracked_struct::Disambiguator, Cycle, Revision, Runtime,