[00070] Restore Server Side App Routing Reverted by the 00034 Merge

rusty-macros/src/lib.rs

@@ -115,7 +115,7 @@ fn expand_widget(input: &DeriveInput) -> syn::Result<proc_macro2::TokenStream> {
         .iter()
         .filter(|f| has_attr(f, "event"))
         .map(EventSpec::parse)
-        .collect::<syn::Result<_>>()?;
+        .collect::<syn::Result<Vec<_>>>()?;
 
     let has_id_field = fields
         .iter()

rusty/src/core/services.rs

@@ -53,6 +53,18 @@ impl ServiceRegistry {
             .and_then(|any| any.downcast::<T>().ok())
     }
 
+    /// Copy every service registered in `other` into this registry, replacing entries of
+    /// the same type.
+    ///
+    /// Used to fold server-level services (registered once on `RustyServer`) into each
+    /// per-session registry. Copying `Arc`s means the instances stay shared across
+    /// sessions - only the lookup table is per-session.
+    pub fn extend_from(&self, other: &ServiceRegistry) {
+        let source = other.map.read().unwrap().clone();
+        let mut target = self.map.write().unwrap();
+        target.extend(source);
+    }
+
     /// Number of registered services.
     pub fn len(&self) -> usize {
         self.map.read().unwrap().len()