Fix merge mistakes and make the `Vapid` component freestanding.

In 4a91792e023a5877f8ac9b8a352e99c4486d698f, I merged in the app component struct changes, but neglected to notice that the `app.vapid()` method had ended up attached to the wrong impl block during the merge. This fixes that.

I've also carried the change to component structs through, so `Vapid` is now a freestanding component, rather than a view of the `App` struct's internals.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/app.rs b/src/app.rs
index 8f16e02..2bfabbe 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -71,6 +71,10 @@ impl App {
     pub fn users(&self) -> Users {
         Users::new(self.db.clone(), self.events.clone())
     }
+
+    pub fn vapid(&self) -> Vapid {
+        Vapid::new(self.db.clone(), self.events.clone())
+    }
 }
 
 impl FromRef<App> for Boot {
@@ -113,8 +117,10 @@ impl FromRef<App> for Tokens {
     fn from_ref(app: &App) -> Self {
         app.tokens()
     }
+}
 
-    pub const fn vapid(&self) -> Vapid<'_> {
-        Vapid::new(&self.db, &self.events)
+impl FromRef<App> for Vapid {
+    fn from_ref(app: &App) -> Self {
+        app.vapid()
     }
 }