From cb8b29f5a0adee7c6437720c5af1be417c1c380c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 14 Feb 2021 22:43:38 +0000 Subject: [PATCH] Document why fehler not centralised Signed-off-by: Ian Jackson --- Cargo.toml | 4 +++- base/Cargo.toml | 4 +++- daemon/Cargo.toml | 4 +++- wasm/Cargo.toml | 4 +++- wdriver/Cargo.toml | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 595323cd..6cb7057b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,6 @@ either = "1" enum-map = { version = "0.6", features = [ "serde" ] } env_logger = "0.8" failure = "0.1.8" # for pwd -fehler = "1" flexi_logger = { version = "0.17", features = [ "specfile" ] } fs2 = "0.4" glob = "0.3" @@ -67,5 +66,8 @@ uds = "0.2" url = "2" vecdeque-stableix = "1" +# Repeated here because importing does not work properly +fehler = "1" + slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" } # ^ MR not yet reviewed diff --git a/base/Cargo.toml b/base/Cargo.toml index 93643dab..86072057 100644 --- a/base/Cargo.toml +++ b/base/Cargo.toml @@ -15,8 +15,10 @@ path = "lib.rs" arrayvec = "0.5" derive_more = "0.99" -fehler = "1" if_chain = "1" thiserror = "1" serde = { version = "1", features = ["derive","rc"] } serde_with = "1" + +# Repeated in other Cargo.toml's because importing does not work properly +fehler = "1" diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index 111c5189..87f90417 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -27,7 +27,6 @@ chrono-tz = "0.5" delegate = "0.5" either = "1" failure = "0.1.8" # for pwd -fehler = "1" flexi_logger = { version = "0.17", features = [ "specfile" ] } fs2 = "0.4" glob = "0.3" @@ -65,6 +64,9 @@ vecdeque-stableix = "1" rocket = { version = "^0.4.6", features=["sse"] } rocket_cors = "0.5" +# Repeated here because importing does not work properly +fehler = "1" + slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" } # ^ MR not yet reviewed diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index 76d00fd6..6c5438d5 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -17,8 +17,10 @@ crate-type = ["cdylib"] otter-base = { path = "../base" } console_error_panic_hook = "0.1" -fehler = "1" js-sys = "0.3" thiserror = "1" wasm-bindgen = "0.2" wee_alloc = "0.4" + +# Repeated here because importing does not work properly +fehler = "1" diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml index 2f71537e..39f1fa4b 100644 --- a/wdriver/Cargo.toml +++ b/wdriver/Cargo.toml @@ -15,7 +15,6 @@ otter = { path = ".." } boolinator = "2" env_logger = "0.8" -fehler = "1" humantime = "2" if_chain = "1" itertools = "0.10" @@ -36,6 +35,9 @@ thirtyfour_sync = "0.22" void = "1" x11rb = "0.8" +# Repeated here because importing does not work properly +fehler = "1" + [lib] name = "otter_webdriver_tests" path = "../wdriver.rs" -- 2.30.2