aboutsummaryrefslogtreecommitdiffstats
path: root/Cargo.toml
diff options
context:
space:
mode:
authorTeddy Wing2018-10-19 00:58:02 +0200
committerTeddy Wing2018-10-19 00:58:02 +0200
commitedba0cc4c81cc91db470fb9604edb6f283c16b88 (patch)
tree7415a3e32a7b9d26a65521d94a2c158c35a4963e /Cargo.toml
parent3edf1126464eb798b6f95789fcce114bad2c05b8 (diff)
downloaddome-key-map-edba0cc4c81cc91db470fb9604edb6f283c16b88.tar.bz2
Config: Add `timeout` field
This new field will be used by the calling Objective-C code as the timeout between multi-button maps. It will be defined in a `config.toml` file in the XDG config directory, with a default if unspecified. That part of the code hasn't been written yet, but we've prepared by deriving Serde `Deserialize` on the `Config` struct in order to deserialise a TOML config file. The latest Serde is v1.0.80, but we can't use it because 'cbindgen' depends on an older version. We had been using 'cbindgen' v0.6.3, which depends on serde v1.0.21. Decided to update 'cbindgen' in order to use a newer version of Serde, but that puts us at v1.0.58 instead of the latest: error: failed to select a version for `serde_derive`. ... required by package `cbindgen v0.6.6` ... which is depended on by `dome-key-map v0.0.1 (file:///Users/tw/Documents/Development/dome-key-map)` versions that meet the requirements `= 1.0.58` are: 1.0.58 all possible versions conflict with previously selected packages. previously selected package `serde_derive v1.0.80` ... which is depended on by `dome-key-map v0.0.1 (file:///Users/tw/Documents/Development/dome-key-map)` failed to select a version for `serde_derive` which could resolve this conflict
Diffstat (limited to 'Cargo.toml')
-rw-r--r--Cargo.toml4
1 files changed, 3 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 53b5729..45b5883 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,11 +12,13 @@ getopts = "0.2.18"
libc = "0.2.43"
log = "0.4.5"
objc = "0.2.5"
+serde = "1.0.58"
+serde_derive = "1.0.58"
stderrlog = "0.4.1"
xdg = "2.1.0"
[build-dependencies]
-cbindgen = "0.6.2"
+cbindgen = "0.6.6"
[lib]
crate-type = ["staticlib"]