Cargo.toml: Prettify layout etc.

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

diff --git a/Cargo.toml b/Cargo.toml
index 626af4129e5bac7926693614127b0cfb7d731bdb..b73dc0339e657be567b0a7e2d826791381bce047 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,10 @@ edition="2018"
 [workspace]
 members=["wasm", "daemon", "wdriver", "apitest"]
 
+[build-dependencies]
+usvg="0.13"
+bundle-sources="0.0.1"
+
 
 [dependencies]
 
@@ -71,9 +75,4 @@ strum        = { version="0.20" , features=["derive"      ] }
 
 slotmap = { git="https://github.com/ijackson/slotmap", branch="entry-return-stale-key", features=["serde"], }
 
-
-[build-dependencies]
-usvg="0.13"
-bundle-sources="0.0.1"
-
 #fin.

diff --git a/apitest/Cargo.toml b/apitest/Cargo.toml
index 32b31055522c806e19eb5fa69a6122b26ca3b08f..5b83a2376e3c7973b1c24c5229ca67034551ac73 100644 (file)
--- a/apitest/Cargo.toml
+++ b/apitest/Cargo.toml
@@ -1,9 +1,29 @@
+# Copyright 2020-2021 Ian Jackson and contributors to Otter
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# There is NO WARRANTY.
+
+[package]
+name="otter-api-tests"
+version="0.0.1"
+
+authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>",
+         "and the contributors to Otter"]
+license="AGPL-3.0-or-later"
+edition="2018"
+
+[lib]
+name="otter_api_tests"
+path="apitest.rs"
 
 [[bin]]
 name="at-otter"
 path="at-otter.rs"
 
+
 [dependencies]
+
+otter.path=".."
+
 ego-tree="0.6"
 fehler="1"
 humantime="2"
@@ -11,30 +31,9 @@ num-traits="0.2"
 scraper="0.12"
 structopt="0.3"
 
-[dependencies.otter]
-path=".."
-
-[dependencies.reqwest]
-version="0.11"
-features=["blocking", "json", "stream"]
-
-[dependencies.serde]
-version="1"
-features=["derive", "rc"]
-
-[dependencies.strum]
-version="0.20"
-features=["derive"]
+reqwest      = { version="0.11" , features=["blocking","json","stream"] }
+serde        = { version="1"    , features=["derive", "rc"] }
+strum        = { version="0.20" , features=["derive"      ] }
 
-[lib]
-name="otter_api_tests"
-path="apitest.rs"
-
-[package]
-edition="2018"
-license="AGPL-3.0-or-later"
-name="otter-api-tests"
-version="0.0.1"
-authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
 
 #fin.

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
index b2f5e5fd95b9f5ec935d6cf7325fb568f2f19c4b..1053503e8404d0d6b8337e7c6f16daa5a108bbe9 100644 (file)
--- a/wasm/Cargo.toml
+++ b/wasm/Cargo.toml
@@ -1,27 +1,34 @@
+# Copyright 2020-2021 Ian Jackson and contributors to Otter
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# There is NO WARRANTY.
+
+[package]
+name="otter-wasm"
+version="0.0.1"
+
+authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>",
+         "and the contributors to Otter"]
+license="AGPL-3.0-or-later"
+edition="2018"
+
+[lib]
+name="otter_wasm"
+path="wasm.rs"
+crate-type=["cdylib"]
 
 [build-dependencies]
 wasm-bindgen-cli="0.2"
 
+
 [dependencies]
+
+otter-base.path="../base"
+
 console_error_panic_hook="0.1"
 fehler="1"
 js-sys="0.3"
-wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 wee_alloc="0.4"
 
-[dependencies.otter-base]
-path="../base"
-
-[lib]
-name="otter_wasm"
-path="wasm.rs"
-crate-type=["cdylib"]
-
-[package]
-edition="2018"
-license="AGPL-3.0-or-later"
-name="otter-wasm"
-version="0.0.1"
-authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
+wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 
 #fin.

diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index e13e906cee83cbaa0944dfaba13024cbb3569af5..880c728597a2f93f2239d7ddf452bb4d44cf5f5e 100644 (file)
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -1,9 +1,25 @@
+# Copyright 2020-2021 Ian Jackson and contributors to Otter
+# SPDX-License-Identifier: AGPL-3.0-or-later
+# There is NO WARRANTY.
+
+[package]
+name="otter-webdriver-tests"
+version="0.0.1"
+
+authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>",
+         "and the contributors to Otter"]
+license="AGPL-3.0-or-later"
+edition="2018"
 
 [[bin]]
 name="wdriver"
 path="wdriver.rs"
 
+
 [dependencies]
+
+otter-api-tests.path="../apitest"
+
 fehler="1"
 ndarray="0.15"
 num-traits="0.2"
@@ -11,22 +27,7 @@ structopt="0.3"
 thirtyfour_sync="0.23"
 x11rb="0.8"
 
-[dependencies.otter-api-tests]
-path="../apitest"
-
-[dependencies.serde]
-version="1"
-features=["derive", "rc"]
-
-[dependencies.strum]
-version="0.20"
-features=["derive"]
-
-[package]
-edition="2018"
-license="AGPL-3.0-or-later"
-name="otter-webdriver-tests"
-version="0.0.1"
-authors=["Ian Jackson <ijackson@chiark.greenend.org.uk>"]
+serde        = { version="1"    , features=["derive", "rc"] }
+strum        = { version="0.20" , features=["derive"      ] }
 
 #fin.