From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Feb 2021 20:11:52 +0000 (+0000)
Subject: Remove duplicate default() fn
X-Git-Tag: otter-0.4.0~397
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0e6e34e96ecff4b7fd82909b039532a4d0b88003;p=otter.git

Remove duplicate default() fn

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

diff --git a/src/imports.rs b/src/imports.rs
index 9a3644b5..cbe0c967 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+pub use otter_base;
 pub use otter_base::imports::*;
 
 pub use anyhow;
diff --git a/wdriver.rs b/wdriver.rs
index 4abe4781..f3495bcc 100644
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -43,6 +43,8 @@ pub use std::process::{self, Command, Stdio};
 pub use std::thread::{self, sleep};
 pub use std::time::{self, Duration};
 
+pub use otter_base::misc::default;
+
 pub use otter::ensure_eq;
 pub use otter::commands::{MgmtCommand, MgmtResponse};
 pub use otter::commands::{MgmtGameInstruction, MgmtGameResponse};
@@ -64,8 +66,6 @@ pub type AE = anyhow::Error;
 
 pub const URL: &str = "http://localhost:8000";
 
-pub fn default<T:Default>() -> T { Default::default() }
-
 use t4::Capabilities;
 use once_cell::sync::OnceCell;
 use otter::config::DAEMON_STARTUP_REPORT;