pacify the merciless clippy

Author: nikomatsakis

src/attach.rs

@@ -74,13 +74,11 @@ impl Attached {
     /// Access the "attached" database. Returns `None` if no database is attached.
     /// Databases are attached with `attach_database`.
     fn with<R>(&self, op: impl FnOnce(&dyn Database) -> R) -> Option<R> {
-        if let Some(db) = self.database.get() {
-            // SAFETY: We always attach the database in for the entire duration of a function,
-            // so it cannot become "unattached" while this function is running.
-            Some(op(unsafe { db.as_ref() }))
-        } else {
-            None
-        }
+        let db = self.database.get()?;
+
+        // SAFETY: We always attach the database in for the entire duration of a function,
+        // so it cannot become "unattached" while this function is running.
+        Some(op(unsafe { db.as_ref() }))
     }
 }
 

src/database.rs

@@ -12,10 +12,11 @@ use crate::{
 /// The trait implemented by all Salsa databases.
 /// You can create your own subtraits of this trait using the `#[salsa::db]` procedural macro.
 ///
-/// # Safety conditions
+/// # Safety
 ///
 /// This trait can only safely be implemented by Salsa's [`DatabaseImpl`][] type.
-/// FIXME: Document better the unsafety conditions we guarantee.
+///
+/// FIXME: Document better the unsafety conditions we require.
 #[salsa_macros::db]
 pub unsafe trait Database: Send + AsDynDatabase + Any {
     /// This function is invoked by the salsa runtime at various points during execution.

src/tracked_struct/struct_map.rs

@@ -80,7 +80,7 @@ where
     ///
     /// * If value with same `value.id` is already present in the map.
     /// * If value not created in current revision.
-    pub fn insert<'db>(&'db self, current_revision: Revision, value: Value<C>) -> C::Struct<'db> {
+    pub fn insert(&self, current_revision: Revision, value: Value<C>) -> C::Struct<'_> {
         assert_eq!(value.created_at, current_revision);
 
         let id = value.id;
@@ -99,7 +99,7 @@ where
         unsafe { C::struct_from_raw(pointer) }
     }
 
-    pub fn validate<'db>(&'db self, current_revision: Revision, id: Id) {
+    pub fn validate(&self, current_revision: Revision, id: Id) {
         let mut data = self.map.get_mut(&id).unwrap();
 
         // UNSAFE: We never permit `&`-access in the current revision until data.created_at
@@ -118,7 +118,7 @@ where
     ///
     /// * If the value is not present in the map.
     /// * If the value is already updated in this revision.
-    pub fn update<'db>(&'db self, current_revision: Revision, id: Id) -> Update<'db, C> {
+    pub fn update(&self, current_revision: Revision, id: Id) -> Update<'_, C> {
         let mut data = self.map.get_mut(&id).unwrap();
 
         // UNSAFE: We never permit `&`-access in the current revision until data.created_at
@@ -163,7 +163,7 @@ where
     ///
     /// * If the value is not present in the map.
     /// * If the value has not been updated in this revision.
-    pub fn get<'db>(&'db self, current_revision: Revision, id: Id) -> C::Struct<'db> {
+    pub fn get(&self, current_revision: Revision, id: Id) -> C::Struct<'_> {
         Self::get_from_map(&self.map, current_revision, id)
     }
 
@@ -173,11 +173,11 @@ where
     ///
     /// * If the value is not present in the map.
     /// * If the value has not been updated in this revision.
-    fn get_from_map<'db>(
-        map: &'db FxDashMap<Id, Alloc<Value<C>>>,
+    fn get_from_map(
+        map: &FxDashMap<Id, Alloc<Value<C>>>,
         current_revision: Revision,
         id: Id,
-    ) -> C::Struct<'db> {
+    ) -> C::Struct<'_> {
         let data = map.get(&id).unwrap();
 
         // UNSAFE: We permit `&`-access in the current revision once data.created_at
@@ -230,7 +230,7 @@ where
     ///
     /// * If the value is not present in the map.
     /// * If the value has not been updated in this revision.
-    pub fn get<'db>(&'db self, current_revision: Revision, id: Id) -> C::Struct<'db> {
+    pub fn get(&self, current_revision: Revision, id: Id) -> C::Struct<'_> {
         StructMap::get_from_map(&self.map, current_revision, id)
     }
 }