From 056e0b6870d646dc6221bea9e47f5afea98647fa Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Tue, 11 Dec 2018 18:48:19 -0800 Subject: Compile program with 2018 Edition of Rust With the 1.31 release of Rust support for Edition 2018 has reached the stable tool chain. This change enables compilation based off of this new edition for the crate. This change resolves issue #6. --- nitrocli/Cargo.toml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'nitrocli/Cargo.toml') diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml index b85acef..1d27ee5 100644 --- a/nitrocli/Cargo.toml +++ b/nitrocli/Cargo.toml @@ -20,6 +20,7 @@ [package] name = "nitrocli" version = "0.1.2" +edition = "2018" authors = ["Daniel Mueller "] license = "GPL-3.0+" homepage = "https://github.com/d-e-s-o/nitrocli" @@ -34,10 +35,6 @@ A command line tool for interacting with the Nitrokey Storage device. version = "1.0" path = "../cc" -[dependencies.hid] -version = "0.4" -path = "../hid" - [dependencies.hidapi-sys] version = "0.1" path = "../hidapi-sys" @@ -46,13 +43,18 @@ path = "../hidapi-sys" version = "0.2" path = "../libc" +[dependencies.libhid] +version = "0.4" +path = "../hid" +package = "hid" + [dependencies.pkg-config] version = "0.3" path = "../pkg-config" [replace] "cc:1.0.25" = { path = "../cc" } -"hid:0.4.1" = { path = "../hid" } "hidapi-sys:0.1.4" = { path = "../hidapi-sys" } "libc:0.2.45" = { path = "../libc" } +"libhid:0.4.1" = { path = "../hid" } "pkg-config:0.3.14" = { path = "../pkg-config" } -- cgit v1.2.1