Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rmk-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ postcard-rpc = { version = "0.12", default-features = false, optional = true }
heapless = { version = "0.9", default-features = false, features = ["serde"] }
strum = { version = "0.28", default-features = false, features = ["derive"] }

bitfield-struct = "0.12"
bitfield-struct = "0.13"

[build-dependencies]
rmk-config = { path = "../rmk-config", version = "=0.6.1" }
Expand Down
2 changes: 1 addition & 1 deletion rmk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ document-features = "0.2"
rmk = { path = ".", default-features = false, features = ["std", "log"] }
critical-section = { version = "1.2", features = ["std"] }
env_logger = "0.11"
ctor = "0.6.0"
ctor = "1.0"
embedded-hal-mock = { version = "0.11.1", features = ["embedded-hal-async"] }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion rmk/src/input_device/pmw33xx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ mod tests {
use crate::test_support::test_block_on as block_on;

// Init logger for tests
#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn init_log() {
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Debug)
Expand Down
2 changes: 1 addition & 1 deletion rmk/src/input_device/pointing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ mod tests {
use crate::test_support::test_block_on as block_on;

// Init logger for tests
#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn init_log() {
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Debug)
Expand Down
2 changes: 1 addition & 1 deletion rmk/src/input_device/rotary_encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ mod test {
use super::*;
// Init logger for tests

#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn init_log() {
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Debug)
Expand Down
2 changes: 1 addition & 1 deletion rmk/src/keyboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1894,7 +1894,7 @@ mod test {
use crate::{a, k, layer, mo, th, thp};

// Init logger for tests
#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn init_log() {
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Debug)
Expand Down
2 changes: 1 addition & 1 deletion rmk/src/test_support.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use embassy_time::{Duration, MockDriver};
// suite under plain `cargo test` lets tests race on it and hang at the 60 s
// virtual-time kill switch below. Abort at test-binary startup with a pointer
// to the right runner instead of making the user wait for that timeout.
#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn require_nextest() {
if std::env::var_os("NEXTEST").is_none() {
eprintln!(
Expand Down
4 changes: 2 additions & 2 deletions rmk/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use rmk::{KeymapData, a, k, layer, lt, mo, shifted, th, wm};
// virtual-time kill switch in `test_block_on`. Abort at test-binary startup
// with a pointer to the right runner instead of making the user wait for that
// timeout.
#[ctor::ctor]
#[ctor::ctor(unsafe)]
fn require_nextest() {
if std::env::var_os("NEXTEST").is_none() {
eprintln!(
Expand All @@ -43,7 +43,7 @@ fn require_nextest() {
}

// Init logger for tests
#[ctor::ctor]
#[ctor::ctor(unsafe)]
pub fn init_log() {
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Debug)
Expand Down