Rename zcoord crate to otter-base

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 4f58f32f4a4d456ee228903370fbc8f16f125cc0..2948fd175812898fa803059bb96f65bbd08304b5 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1611,7 +1611,7 @@ dependencies = [
  "num-derive",
  "num-traits",
  "ordered-float",
- "otter-zcoord",
+ "otter-base",
  "parking_lot",
  "percent-encoding 2.1.0",
  "pwd",
@@ -1635,6 +1635,19 @@ dependencies = [
  "vecdeque-stableix",
 ]
 
+[[package]]
+name = "otter-base"
+version = "0.0.1"
+dependencies = [
+ "arrayvec",
+ "derive_more",
+ "fehler",
+ "if_chain",
+ "serde",
+ "serde_with",
+ "thiserror",
+]
+
 [[package]]
 name = "otter-daemon"
 version = "0.0.1"
@@ -1667,7 +1680,7 @@ dependencies = [
  "num-traits",
  "ordered-float",
  "otter",
- "otter-zcoord",
+ "otter-base",
  "parking_lot",
  "percent-encoding 2.1.0",
  "pwd",
@@ -1698,7 +1711,7 @@ dependencies = [
  "console_error_panic_hook",
  "fehler",
  "js-sys",
- "otter-zcoord",
+ "otter-base",
  "thiserror",
  "wasm-bindgen",
  "wee_alloc",
@@ -1733,19 +1746,6 @@ dependencies = [
  "x11rb",
 ]
 
-[[package]]
-name = "otter-zcoord"
-version = "0.0.1"
-dependencies = [
- "arrayvec",
- "derive_more",
- "fehler",
- "if_chain",
- "serde",
- "serde_with",
- "thiserror",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.11.1"

diff --git a/Cargo.toml b/Cargo.toml
index 4848630b49f955e8a34cc982e710a9fd336756d7..8bdc4e78fd18998a24dda251fbb5444a5cbd2630 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ members = ["wasm", "daemon", "wdriver"]
 
 [dependencies]
 
-otter-zcoord = { path = "zcoord" }
+otter-base = { path = "base" }
 
 anyhow = "1"
 argparse = "0.2"

diff --git a/Makefile b/Makefile
index 9bb57d237478a484a017a6f9f03d537b2ebc1831..04990693ece6b026b02a1a5a067423595c2640ab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ stamp/cargo.doc-otter-only: $(call rsrcs,.)
        $(stamp)
 
 $(addprefix stamp/cargo.wasm-,$(DR)):: \
-stamp/cargo.wasm-%: $(call rsrcs, zcoord wasm Cargo.*)
+stamp/cargo.wasm-%: $(call rsrcs, base wasm Cargo.*)
        $(CARGO) build --target $(WASM) -p otter-wasm $(call cr,$*)
        $(stamp)
 

diff --git a/zcoord/Cargo.toml b/base/Cargo.toml
similarity index 84%
rename from zcoord/Cargo.toml
rename to base/Cargo.toml
index eaa4a1bd4741778725ff0c0a9bb4cb620c7d1d53..93643dabbe7a7f691e88b256a7097204e39ea694 100644 (file)
--- a/zcoord/Cargo.toml
+++ b/base/Cargo.toml
@@ -1,6 +1,6 @@
 
 [package]
-name = "otter-zcoord"
+name = "otter-base"
 authors = ["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
 license = "AGPL-3.0-or-later"
 
@@ -8,8 +8,8 @@ version = "0.0.1"
 edition = "2018"
 
 [lib]
-name = "zcoord"
-path = "zcoord.rs"
+name = "otter_base"
+path = "lib.rs"
 
 [dependencies]
 

diff --git a/base/lib.rs b/base/lib.rs
new file mode 100644 (file)
index 0000000..223d3c0
--- /dev/null
+++ b/base/lib.rs
@@ -0,0 +1,6 @@
+// Copyright 2020-2021 Ian Jackson and contributors to Otter
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
+pub mod zcoord;
+pub mod misc;

diff --git a/zcoord/misc.rs b/base/misc.rs
similarity index 100%
rename from zcoord/misc.rs
rename to base/misc.rs

diff --git a/zcoord/zcoord.rs b/base/zcoord.rs
similarity index 99%
rename from zcoord/zcoord.rs
rename to base/zcoord.rs
index 50804a852fb12e30c5e334b803c9f0f67812cf22..339ad36462d87e708968713d0a5ab9635b3730c2 100644 (file)
--- a/zcoord/zcoord.rs
+++ b/base/zcoord.rs
@@ -78,8 +78,6 @@ use serde_with::DeserializeFromStr;
 use serde_with::SerializeDisplay;
 use thiserror::Error;
 
-pub mod misc;
-
 //---------- core definitions ----------
 
 pub type RangeCount = u32;

diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index c48bc4f10bbc43b55569e061cc5a6bda0a61ad77..0a3478c7946313a44902011a6eea61574d8d07dd 100644 (file)
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -16,7 +16,7 @@ path = "main.rs"
 
 [dependencies]
 otter = { path = ".." }
-otter-zcoord = { path = "../zcoord" }
+otter-base = { path = "../base" }
 
 anyhow = "1"
 argparse = "0.2"

diff --git a/daemon/session.rs b/daemon/session.rs
index ad6faa65a3f914454233cc2229e53aa2be5fe368..31508835ae70fa107db9169d383a2af9f7873e23 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -164,7 +164,7 @@ fn session_inner(form: Json<SessionForm>,
     ).map(|logent|{
       let mut when = logent.when.render(tz);
       if layout.abbreviate_timestamps() {
-        let (abbrev, _) = zcoord::misc::timestring_abbreviate(
+        let (abbrev, _) = base_misc::timestring_abbreviate(
           timestamp_abbrev.get_or_insert(default()),
           &when
         );

diff --git a/src/gamestate.rs b/src/gamestate.rs
index 1edc3e3e71cd56fe185522bf322cc3b4c2a4313e..b728bc3c7e8d9b69b94179e5db79491a96f06a9b 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -253,7 +253,7 @@ impl VisiblePieceAngle {
   pub fn to_transform(self) -> VisibleAngleTransform {
     match self.0 {
       PieceAngle::Compass(angle) => VisibleAngleTransform(
-        zcoord::misc::raw_angle_transform(
+        base_misc::raw_angle_transform(
           angle.into()
         )
       ),

diff --git a/src/prelude.rs b/src/prelude.rs
index 39097f2f3a50bf9959ff0ce69f2ae56bb77980a4..6632643dbe2adae3bf993734e9683a3a3ff312cf 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -80,8 +80,10 @@ pub use strum::EnumString;
 pub use thiserror::Error;
 pub use url::Url;
 pub use vecdeque_stableix::Deque as StableIndexVecDeque;
-pub use zcoord::{self, ZCoord};
-pub use zcoord::misc::default;
+
+pub use otter_base::zcoord::{self, ZCoord};
+pub use otter_base::misc as base_misc;
+pub use base_misc::default;
 
 pub use crate::from_instance_lock_error;
 

diff --git a/src/slotmap-slot-idx.rs b/src/slotmap-slot-idx.rs
index f09893605fe8b6d50da98f019d50647e5040eda3..64cf5fed064abd4abed7eb43b40e695f09ba3dfd 100644 (file)
--- a/src/slotmap-slot-idx.rs
+++ b/src/slotmap-slot-idx.rs
@@ -7,7 +7,7 @@
 //! Provides a [`get_idx_key`](trait.KeyDataExt.html#tymethod.get_idx_version) method on
 //! `slotmap::KeyData`.  See [KeyDataExt::get_idx_version].
 
-use zcoord::misc::default;
+use otter_base::misc::default;
 
 /// Extension trait for `slotmap::KeyData`, providing `get_idx_version`.
 ///

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index 9627645469cd7a2030743e4f1b13a3d810886f6b..76d00fd6fc7f269c03c00c3937a04e046fb1dcce 100644 (file)
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 
-otter-zcoord = { path = "../zcoord" }
+otter-base = { path = "../base" }
 
 console_error_panic_hook = "0.1"
 fehler = "1"

diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index e6142d4c5d246859c2091bed104e552267b9bfa2..9a30b415e082f62dc0faa31e05a4a94958878405 100644 (file)
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -9,8 +9,10 @@ use js_sys::JsString;
 use thiserror::Error;
 use wasm_bindgen::prelude::*;
 
+use otter_base::zcoord;
+use otter_base::misc as base_misc;
 use zcoord::{Mutable,ZCoord};
-use zcoord::misc::default;
+use base_misc::default;
 
 #[derive(Error,Clone,Copy,Debug,Eq,PartialEq)]
 #[error("packed Z coordinate wrong JS type (not a string)")]
@@ -108,7 +110,7 @@ pub fn timestamp_abbreviator(j: JsString) -> TimestampAbbreviator {
 impl TimestampAbbreviator {
   pub fn update(&mut self, now: &JsString) -> JsString {
     let now: String = now.into();
-    let (abbrev, _) = zcoord::misc::timestring_abbreviate(&self.last, &now);
+    let (abbrev, _) = base_misc::timestring_abbreviate(&self.last, &now);
     let abbrev = abbrev.into();
     self.last = now;
     abbrev
@@ -117,7 +119,7 @@ impl TimestampAbbreviator {
 
 #[wasm_bindgen]
 pub fn angle_transform(angle: u8) -> JsString {
-  zcoord::misc::raw_angle_transform(angle).into()
+  base_misc::raw_angle_transform(angle).into()
 }
 
 #[wasm_bindgen]