Skip to content

Commit

Permalink
tool: Update toolchain, edition, deps
Browse files Browse the repository at this point in the history
- Update toolchain to nightly-2023-09-07
- Update edition to 2021
- Update deps

`OpenHidDeviceError` is deprecated, and is removed in newer versions.
Replace it with `HidApiErrorEmpty`, because there are no descriptions
for what anything means so I just picked one that didn't require fields.

Signed-off-by: Tim Crawford <[email protected]>
  • Loading branch information
crawfxrd authored and jackpot51 committed Oct 5, 2023
1 parent c461e20 commit 782f18a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-01-21"
channel = "nightly-2023-09-07"
components = ["rust-src"]
35 changes: 19 additions & 16 deletions tool/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions tool/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "system76_ectool"
version = "0.3.8"
edition = "2018"
edition = "2021"
description = "System76 EC tool"
license = "MIT"
authors = ["Jeremy Soller <[email protected]>"]
Expand All @@ -18,7 +18,8 @@ required-features = ["std", "hidapi", "clap"]
[dependencies]
clap = { version = "3.2", optional = true }
libc = { version = "0.2", optional = true }
hidapi = { version = "1.4", default-features = false, features = ["linux-shared-hidraw"], optional = true }
# NOTE: Upgrading to 2.x blocked on Ubuntu shipping newer hidapi
hidapi = { version = "1.5", default-features = false, features = ["linux-shared-hidraw"], optional = true }
redox_hwio = { version = "0.1.6", default-features = false, optional = true }
downcast-rs = { version = "1.2.0", default-features = false }

Expand All @@ -28,6 +29,3 @@ std = ["libc", "downcast-rs/std"]

[package.metadata.docs.rs]
all-features = true

[registries.crates-io]
protocol = "sparse"
2 changes: 1 addition & 1 deletion tool/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ fn main() {
_ => {},
}
}
Err(hidapi::HidError::OpenHidDeviceError.into())
Err(hidapi::HidError::HidApiErrorEmpty.into())
}
_ => unreachable!(),
}
Expand Down

0 comments on commit 782f18a

Please sign in to comment.