From cff17107bd81031370279e10e31ed1798d5bcc27 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Sat, 27 Jul 2024 19:08:34 +0000
Subject: [PATCH] rename Storage to ZalsaImpl, privatize

---
 src/database.rs | 12 ++++++++----
 src/lib.rs      |  2 --
 src/storage.rs  |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/database.rs b/src/database.rs
index 52f74e65..55a2b6d6 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -1,6 +1,10 @@
 use std::{any::Any, panic::RefUnwindSafe};
 
-use crate::{self as salsa, local_state, storage::Zalsa, Durability, Event, Revision, Storage};
+use crate::{
+    self as salsa, local_state,
+    storage::{Zalsa, ZalsaImpl},
+    Durability, Event, Revision,
+};
 
 /// The trait implemented by all Salsa databases.
 /// You can create your own subtraits of this trait using the `#[salsa::db]` procedural macro.
@@ -98,7 +102,7 @@ impl dyn Database {
 /// Concrete implementation of the [`Database`][] trait.
 /// Takes an optional type parameter `U` that allows you to thread your own data.
 pub struct DatabaseImpl<U: UserData = ()> {
-    storage: Storage<U>,
+    storage: ZalsaImpl<U>,
 }
 
 impl<U: UserData + Default> Default for DatabaseImpl<U> {
@@ -113,7 +117,7 @@ impl DatabaseImpl<()> {
     /// You can also use the [`Default`][] trait if your userdata implements it.
     pub fn new() -> Self {
         Self {
-            storage: Storage::with(()),
+            storage: ZalsaImpl::with(()),
         }
     }
 }
@@ -124,7 +128,7 @@ impl<U: UserData> DatabaseImpl<U> {
     /// You can also use the [`Default`][] trait if your userdata implements it.
     pub fn with(u: U) -> Self {
         Self {
-            storage: Storage::with(u),
+            storage: ZalsaImpl::with(u),
         }
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 7b38a291..098cd9d9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -42,7 +42,6 @@ pub use self::input::setter::Setter;
 pub use self::key::DatabaseKeyIndex;
 pub use self::revision::Revision;
 pub use self::runtime::Runtime;
-pub use self::storage::Storage;
 pub use self::update::Update;
 pub use crate::local_state::with_attached_database;
 pub use salsa_macros::accumulator;
@@ -89,7 +88,6 @@ pub mod plumbing {
     pub use crate::storage::views;
     pub use crate::storage::IngredientCache;
     pub use crate::storage::IngredientIndex;
-    pub use crate::storage::Storage;
     pub use crate::storage::Zalsa;
     pub use crate::tracked_struct::TrackedStructInDb;
     pub use crate::update::always_update;
diff --git a/src/storage.rs b/src/storage.rs
index f05c22f8..43ac7670 100644
--- a/src/storage.rs
+++ b/src/storage.rs
@@ -72,7 +72,7 @@ pub trait Zalsa {
     fn report_tracked_write(&mut self, durability: Durability);
 }
 
-impl<U: UserData> Zalsa for Storage<U> {
+impl<U: UserData> Zalsa for ZalsaImpl<U> {
     fn views(&self) -> &Views {
         &self.views_of
     }
@@ -212,7 +212,7 @@ impl IngredientIndex {
 
 /// The "storage" struct stores all the data for the jars.
 /// It is shared between the main database and any active snapshots.
-pub struct Storage<U: UserData> {
+pub(crate) struct ZalsaImpl<U: UserData> {
     user_data: U,
     
     views_of: ViewsOf<DatabaseImpl<U>>,
@@ -241,14 +241,14 @@ pub struct Storage<U: UserData> {
 }
 
 // ANCHOR: default
-impl<U: UserData + Default> Default for Storage<U> {
+impl<U: UserData + Default> Default for ZalsaImpl<U> {
     fn default() -> Self {
         Self::with(Default::default())
     }
 }
 // ANCHOR_END: default
 
-impl<U: UserData> Storage<U> {
+impl<U: UserData> ZalsaImpl<U> {
     pub(crate) fn with(user_data: U) -> Self {
         Self {
             views_of: Default::default(),