give salsa_runtime a default implementation

calc-example/calc/src/db.rs

@@ -47,14 +47,6 @@ impl Default for Database {
 
 // ANCHOR: db_impl
 impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-
     fn salsa_event(&self, event: salsa::Event) {
         // Log interesting events, if logging is enabled
         if let Some(logs) = &self.logs {

components/salsa-2022/src/database.rs

@@ -11,9 +11,9 @@ pub trait Database: HasJarsDyn + AsSalsaDatabase {
         log::debug!("salsa_event: {:?}", event.debug(self));
     }
 
-    fn salsa_runtime(&self) -> &Runtime;
-
-    fn salsa_runtime_mut(&mut self) -> &mut Runtime;
+    fn salsa_runtime(&self) -> &Runtime {
+        self.runtime()
+    }
 }
 
 /// Indicates a database that also supports parallel query

salsa-2022-tests/tests/accumulate-from-tracked-fn.rs

@@ -51,14 +51,6 @@ struct Database {
 
 impl salsa::Database for Database {
     fn salsa_event(&self, _event: salsa::Event) {}
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/accumulate-reuse-workaround.rs

@@ -55,14 +55,6 @@ struct Database {
 
 impl salsa::Database for Database {
     fn salsa_event(&self, _event: salsa::Event) {}
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/accumulate-reuse.rs

@@ -50,14 +50,6 @@ struct Database {
 
 impl salsa::Database for Database {
     fn salsa_event(&self, _event: salsa::Event) {}
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/accumulate.rs

@@ -70,14 +70,6 @@ struct Database {
 
 impl salsa::Database for Database {
     fn salsa_event(&self, _event: salsa::Event) {}
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/cycles.rs

@@ -78,18 +78,10 @@ struct Database {
     storage: salsa::Storage<Self>,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
-
 impl Db for Database {}
 
+impl salsa::Database for Database {}
+
 impl RefUnwindSafe for Database {}
 
 #[salsa::input(jar = Jar)]

salsa-2022-tests/tests/debug.rs

@@ -30,15 +30,7 @@ struct Database {
     storage: salsa::Storage<Self>,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/deletion-cascade.rs

@@ -76,14 +76,6 @@ impl salsa::Database for Database {
             _ => {}
         }
     }
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/deletion.rs

@@ -69,14 +69,6 @@ impl salsa::Database for Database {
             _ => {}
         }
     }
-
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl Db for Database {}

salsa-2022-tests/tests/expect_reuse_field_x_of_a_tracked_struct_changes_but_fn_depends_on_field_y.rs

@@ -53,15 +53,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/expect_reuse_field_x_of_an_input_changes_but_fn_depends_on_field_y.rs

@@ -37,15 +37,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/hello_world.rs

@@ -40,15 +40,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/lru.rs

@@ -66,15 +66,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/mutate_in_place.rs

@@ -22,15 +22,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/override_new_get_set.rs

@@ -72,15 +72,7 @@ fn execute() {
         storage: salsa::Storage<Self>,
     }
 
-    impl salsa::Database for Database {
-        fn salsa_runtime(&self) -> &salsa::Runtime {
-            self.storage.runtime()
-        }
-
-        fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-            self.storage.runtime_mut()
-        }
-    }
+    impl salsa::Database for Database {}
 
     impl Db for Database {}
 

salsa-2022-tests/tests/parallel/setup.rs

@@ -38,19 +38,11 @@ pub(crate) struct Database {
 }
 
 impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
     fn salsa_event(&self, event: salsa::Event) {
         if let salsa::EventKind::WillBlockOn { .. } = event.kind {
             self.signal(self.knobs().signal_on_will_block.get());
         }
     }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
 }
 
 impl salsa::ParallelDatabase for Database {

salsa-2022-tests/tests/specify_tracked_fn_in_rev_1_but_not_2.rs

@@ -72,14 +72,6 @@ struct Database {
 }
 
 impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-
     fn salsa_event(&self, event: salsa::Event) {
         self.push_log(format!("{:?}", event.debug(self)));
     }

salsa-2022-tests/tests/tracked_fn_on_input.rs

@@ -25,15 +25,7 @@ fn execute() {
         storage: salsa::Storage<Self>,
     }
 
-    impl salsa::Database for Database {
-        fn salsa_runtime(&self) -> &salsa::Runtime {
-            self.storage.runtime()
-        }
-
-        fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-            self.storage.runtime_mut()
-        }
-    }
+    impl salsa::Database for Database {}
 
     impl Db for Database {}
 

salsa-2022-tests/tests/tracked_fn_on_tracked.rs

@@ -27,15 +27,7 @@ struct Database {
     storage: salsa::Storage<Self>,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/tracked_fn_on_tracked_specify.rs

@@ -37,15 +37,7 @@ struct Database {
     storage: salsa::Storage<Self>,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}
 

salsa-2022-tests/tests/tracked_fn_read_own_entity.rs

@@ -41,15 +41,7 @@ struct Database {
     logger: Logger,
 }
 
-impl salsa::Database for Database {
-    fn salsa_runtime(&self) -> &salsa::Runtime {
-        self.storage.runtime()
-    }
-
-    fn salsa_runtime_mut(&mut self) -> &mut salsa::Runtime {
-        self.storage.runtime_mut()
-    }
-}
+impl salsa::Database for Database {}
 
 impl Db for Database {}