gen_server: prefix public types with Gen (GenServerRef, GenServerCtx, GenServerName, GenServerBuilder, NamedGenServerBuilder)

tests/gen_server.rs

@@ -1,7 +1,7 @@
 //! gen_server tests: call round-trip, cast, lifecycle callbacks, and the two
 //! server-down detection paths (reply-channel close vs. inbox-send failure).
 
-use smarm::gen_server::{start, CallError, GenServer, ServerBuilder};
+use smarm::gen_server::{start, CallError, GenServer, GenServerBuilder};
 use smarm::run;
 use std::sync::{Arc, Mutex};
 
@@ -73,7 +73,7 @@ impl GenServer for Lifecycle {
     type Info = ();
     type Timer = ();
 
-    fn init(&mut self, _ctx: &smarm::gen_server::ServerCtx<Self>) {
+    fn init(&mut self, _ctx: &smarm::gen_server::GenServerCtx<Self>) {
         self.log.lock().unwrap().push("init");
     }
 
@@ -275,7 +275,7 @@ fn info_is_dispatched() {
     let got2 = got.clone();
     run(move || {
         let (info_tx, info_rx) = smarm::channel::<&'static str>();
-        let server = ServerBuilder::new(Logger { log: Vec::new() })
+        let server = GenServerBuilder::new(Logger { log: Vec::new() })
             .with_info(info_rx)
             .start();
         info_tx.send("info").unwrap();
@@ -293,7 +293,7 @@ fn info_outranks_inbox() {
     let got2 = got.clone();
     run(move || {
         let (info_tx, info_rx) = smarm::channel::<&'static str>();
-        let server = ServerBuilder::new(Logger { log: Vec::new() })
+        let server = GenServerBuilder::new(Logger { log: Vec::new() })
             .with_info(info_rx)
             .start();
         // The server actor hasn't run yet: both messages are queued before
@@ -314,7 +314,7 @@ fn info_arms_keep_declaration_priority() {
     run(move || {
         let (hi_tx, hi_rx) = smarm::channel::<&'static str>();
         let (lo_tx, lo_rx) = smarm::channel::<&'static str>();
-        let server = ServerBuilder::new(Logger { log: Vec::new() })
+        let server = GenServerBuilder::new(Logger { log: Vec::new() })
             .with_info(hi_rx)
             .with_info(lo_rx)
             .start();
@@ -335,7 +335,7 @@ fn closed_info_arm_is_dropped_silently() {
     let got2 = got.clone();
     run(move || {
         let (info_tx, info_rx) = smarm::channel::<&'static str>();
-        let server = ServerBuilder::new(Logger { log: Vec::new() })
+        let server = GenServerBuilder::new(Logger { log: Vec::new() })
             .with_info(info_rx)
             .start();
         drop(info_tx); // closed before the server's first select
@@ -371,7 +371,7 @@ impl GenServer for Pool {
     type Info = ();
     type Timer = ();
 
-    fn init(&mut self, ctx: &smarm::gen_server::ServerCtx<Self>) {
+    fn init(&mut self, ctx: &smarm::gen_server::GenServerCtx<Self>) {
         self.watcher = Some(ctx.watcher());
     }
 
@@ -448,7 +448,7 @@ fn unused_ctx_closes_control_arm_silently() {
 // RFC 015 — gen_server timers. A server that arms one-shot timers from a cast
 // and records each fire's payload, plus the cancel race signal.
 // ---------------------------------------------------------------------------
-use smarm::gen_server::{ServerCtx, TimerHandle};
+use smarm::gen_server::{GenServerCtx, TimerHandle};
 use smarm::TimerId;
 
 enum TkCast {
@@ -471,7 +471,7 @@ impl GenServer for Timed {
     type Info = ();
     type Timer = u32;
 
-    fn init(&mut self, ctx: &ServerCtx<Self>) {
+    fn init(&mut self, ctx: &GenServerCtx<Self>) {
         self.timer = Some(ctx.timer());
     }
 
@@ -597,7 +597,7 @@ impl GenServer for Idler {
     type Info = ();
     type Timer = ();
 
-    fn init(&mut self, ctx: &ServerCtx<Self>) {
+    fn init(&mut self, ctx: &GenServerCtx<Self>) {
         ctx.idle_after(self.window);
     }
     fn handle_call(&mut self, _: ()) -> u32 {