From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 31 Jan 2021 23:44:49 +0000 (+0000)
Subject: use our default() alias everywhere we can
X-Git-Tag: otter-0.4.0~575
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f8aae70ccd0b994e2cb7d4b93a35c880f8dd850b;p=otter.git

use our default() alias everywhere we can

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 06da931c..63e35fa0 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -567,7 +567,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
         .remove(piece).ok_or(ME::PieceNotFound)?;
       let gs = &mut ig.gs;
       let pc = gs.pieces.as_mut(modperm).remove(piece);
-      let desc_html = p.describe_html(Some(Default::default()));
+      let desc_html = p.describe_html(Some(default()));
       if let Some(pc) = pc { p.delete_hook(&pc, gs); }
       (U{ pcs: vec![(piece, PieceUpdateOp::Delete())],
           log: vec![ LogEntry {
@@ -614,7 +614,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
         let pc = PieceState {
           held: None,
           zlevel: ZLevel { z: z.increment()?, zg: gs.gen },
-          lastclient: Default::default(),
+          lastclient: default(),
           gen_before_lastclient: Generation(0),
           pinned: pinned.unwrap_or(false),
           angle,
@@ -787,7 +787,7 @@ impl UpdateHandler {
   fn from_how(how: MgmtGameUpdateMode) -> Self {
     use UpdateHandler::*;
     match how {
-      MgmtGameUpdateMode::Bulk => Bulk(Default::default()),
+      MgmtGameUpdateMode::Bulk => Bulk(default()),
       MgmtGameUpdateMode::Online => Online,
     }
   }
diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index d2d96ef6..32c04fb3 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -118,7 +118,7 @@ fn parse_args<T:Default,U>(
   completer: &dyn Fn(T) -> Result<U, ArgumentParseError>,
   extra_help: Option<&dyn Fn(&mut dyn Write) -> Result<(), io::Error>>,
 ) -> U {
-  let mut parsed = Default::default();
+  let mut parsed = default();
   let ap = apmaker(&mut parsed);
   let us = args.get(0).expect("argv[0] must be provided!").clone();
 
diff --git a/src/config.rs b/src/config.rs
index cc0588cd..4d9fd9df 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -131,7 +131,7 @@ impl TryFrom<ServerConfigSpec> for WholeServerConfig {
 
       let mut log = match log {
         Some(Table(log)) => log,
-        None => Default::default(),
+        None => default(),
         Some(x) => throw!(anyhow!(
           r#"wanted table for "log" config key, not {}"#,
           x.type_str())
diff --git a/src/global.rs b/src/global.rs
index 29fa9c51..fa8523ed 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -299,7 +299,7 @@ impl Instance {
     let g = Instance {
       name : name.clone(),
       gs, acl,
-      ipieces: PiecesLoaded(Default::default()),
+      ipieces: PiecesLoaded(default()),
       clients: default(),
       iplayers: default(),
       tokens_players: default(),
@@ -1067,7 +1067,7 @@ impl InstanceGuard<'_> {
     }).collect();
 
     for mut p in gs.pieces.values_mut() {
-      p.lastclient = Default::default();
+      p.lastclient = default();
       if let Some(held) = p.held {
         if !gs.players.contains_key(held) { p.held = None }
       }
@@ -1408,7 +1408,7 @@ fn client_expire_old_clients() {
       }
     }
 
-    let mut now = Now(Default::default());
+    let mut now = Now(default());
     let (mut c, _) = now.iter(&gref, max_age);
     c.g.clients.retain(|c,_| !now.0.contains(&c));
     let mut gref = InstanceGuard { c, gref: gref.clone() };
diff --git a/src/shapelib.rs b/src/shapelib.rs
index 8390dea6..9a68bbde 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -265,7 +265,7 @@ impl Contents {
       let ier = ItemEnquiryData {
         itemname: k.clone(),
         f0bbox,
-        f0desc: loaded.describe_html(Some(Default::default())),
+        f0desc: loaded.describe_html(Some(default())),
       };
       out.push(ier);
     }
@@ -334,7 +334,7 @@ fn load_catalogue(libname: &str, dirname: &str, toml_path: &str) -> Contents {
     items: HashMap::new(),
     dirname: dirname.to_string(),
   };
-  let empty_table = toml::value::Value::Table(Default::default());
+  let empty_table = toml::value::Value::Table(default());
   let groups =
     toplevel
     .as_table().ok_or_else(|| LLE::ExpectedTable(format!("toplevel")))?
diff --git a/src/slotmap-slot-idx.rs b/src/slotmap-slot-idx.rs
index 8c317fd2..d571f6e0 100644
--- a/src/slotmap-slot-idx.rs
+++ b/src/slotmap-slot-idx.rs
@@ -47,7 +47,7 @@ impl KeyDataExt for slotmap::KeyData {
 /// representation has changed too much.  Should not be able to fail
 /// otherwise.
 pub fn keydata_extract(key: slotmap::KeyData) -> Result<(u32, u32), Error> {
-  let mut m: MainExtractor = std::default::Default::default();
+  let mut m: MainExtractor = Default::default();
   key.serialize(&mut m)?;
   Ok(( m.idx    .ok_or(error(line!()))?,
        m.version.ok_or(error(line!()))? ))
diff --git a/src/updates.rs b/src/updates.rs
index 9b753e1c..9bda54b8 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -201,7 +201,7 @@ impl PlayerUpdatesBuildContext {
   pub fn new(&self) -> PlayerUpdates {
     let mut log = StableIndexVecDeque::with_capacity(50);
     log.push_back(self.u1.clone());
-    let cv = Default::default();
+    let cv = default();
     PlayerUpdates { log, cv }
   }
 }