aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.builds/archlinux.yml2
-rw-r--r--Cargo.lock6
-rw-r--r--Cargo.toml2
-rw-r--r--src/device.rs4
-rw-r--r--src/util.rs1
5 files changed, 7 insertions, 8 deletions
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index 7f708e8..11e9043 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -8,7 +8,7 @@ sources:
tasks:
- setup: |
rustup set profile minimal
- rustup default 1.36.0
+ rustup default 1.37.0
rustup target add thumbv7m-none-eabi
rustup component add rustfmt
rustup component add clippy
diff --git a/Cargo.lock b/Cargo.lock
index de31715..9acba0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -111,7 +111,7 @@ dependencies = [
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde-big-array 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ssmarshal 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"stm32f1xx-hal 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"usb-device 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -206,7 +206,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "static_assertions"
-version = "0.3.4"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -314,7 +314,7 @@ dependencies = [
"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
"checksum ssmarshal 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f3e6ad23b128192ed337dfa4f1b8099ced0c2bf30d61e551b65fda5916dbb850"
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3"
+"checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
"checksum stm32-usbd 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "360fa63fdf1b5b0d2ce4a08ecf11aca186b2ecdaff1f6f17c5af1941146a9710"
"checksum stm32f1 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "22ce629123831891663402861bdc7140ebfd6a34a464329f9b9ec1cfde72055a"
"checksum stm32f1xx-hal 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5549c540b1bb113a09cf805b532132b16e4f7a04c9c31058c2f2f99a54490e43"
diff --git a/Cargo.toml b/Cargo.toml
index 8504c06..4b21f02 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ cortex-m-rt = "0.6.11"
embedded-hal = "0.2.3"
panic-halt = "0.2.0"
serde-big-array = "0.2.0"
-static_assertions = "0.3.4"
+static_assertions = "1.1.0"
usb-device = "0.2.3"
[dependencies.hal]
diff --git a/src/device.rs b/src/device.rs
index 830fa93..7820a80 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -66,7 +66,7 @@ struct Request {
pub crc: u32,
}
-assert_eq_size!(request; [u8; REPORT_LEN], Request);
+assert_eq_size!([u8; REPORT_LEN], Request);
#[derive(Serialize)]
struct Response {
@@ -79,7 +79,7 @@ struct Response {
pub crc: u32,
}
-assert_eq_size!(response; [u8; REPORT_LEN], Response);
+assert_eq_size!([u8; REPORT_LEN], Response);
impl Response {
fn new(device_status: DeviceStatus, command_id: u8, last_crc: u32) -> Response {
diff --git a/src/util.rs b/src/util.rs
index 7b12afb..4539bd6 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -80,7 +80,6 @@ macro_rules! enum_u8 {
macro_rules! assert_maximum_size {
($i:ident; $t:ident, $e: expr) => {
::static_assertions::const_assert!(
- $i;
::core::mem::size_of::<$t>() <= $e
);
}