From e812fd556926e0324090b56c02e29943828f6cdb Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 30 Jan 2024 09:03:13 +0100 Subject: [PATCH 1/3] tests: Consistently use riot-wrappers by path without extra riot-sys patch --- tests/.cargo/config.toml | 3 --- tests/adc/Cargo.toml | 2 +- tests/auto-init/Cargo.toml | 2 +- tests/dac/Cargo.toml | 6 +----- tests/gnrc-pktbuf/Cargo.toml | 5 +---- tests/gpio/Cargo.toml | 3 +-- tests/i2c/Cargo.toml | 3 +-- tests/led/Cargo.toml | 2 +- tests/mutex/Cargo.toml | 2 +- tests/random/Cargo.toml | 2 +- tests/ztimer-async/Cargo.toml | 2 +- 11 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 tests/.cargo/config.toml diff --git a/tests/.cargo/config.toml b/tests/.cargo/config.toml deleted file mode 100644 index e2384472..00000000 --- a/tests/.cargo/config.toml +++ /dev/null @@ -1,3 +0,0 @@ -[patch.crates-io] -riot-wrappers = { path = ".." } -riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" } diff --git a/tests/adc/Cargo.toml b/tests/adc/Cargo.toml index 081db194..c0f6df5c 100644 --- a/tests/adc/Cargo.toml +++ b/tests/adc/Cargo.toml @@ -12,6 +12,6 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler" ] } riot-sys = "*" embedded-hal = "0.2.4" diff --git a/tests/auto-init/Cargo.toml b/tests/auto-init/Cargo.toml index d351428f..8f9cb8fc 100644 --- a/tests/auto-init/Cargo.toml +++ b/tests/auto-init/Cargo.toml @@ -12,4 +12,4 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler" ] } diff --git a/tests/dac/Cargo.toml b/tests/dac/Cargo.toml index f4e0ef37..f465f9c9 100644 --- a/tests/dac/Cargo.toml +++ b/tests/dac/Cargo.toml @@ -12,8 +12,4 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler" ] } -riot-sys = "*" - -[patch.crates-io] -riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" } +riot-wrappers = { path = "../..", features = [ "set_panic_handler" ] } diff --git a/tests/gnrc-pktbuf/Cargo.toml b/tests/gnrc-pktbuf/Cargo.toml index b23236f4..c234f955 100644 --- a/tests/gnrc-pktbuf/Cargo.toml +++ b/tests/gnrc-pktbuf/Cargo.toml @@ -12,8 +12,5 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler", "panic_handler_format" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler", "panic_handler_format" ] } riot-sys = "*" - -[patch.crates-io] -riot-sys = { git = "https://github.com/RIOT-OS/rust-riot-sys" } diff --git a/tests/gpio/Cargo.toml b/tests/gpio/Cargo.toml index e23a3b41..c90d1d2a 100644 --- a/tests/gpio/Cargo.toml +++ b/tests/gpio/Cargo.toml @@ -12,6 +12,5 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler", "panic_handler_format" ] } -riot-sys = "*" +riot-wrappers = { path = "../..", features = [ "set_panic_handler", "panic_handler_format" ] } embedded-hal = "1" diff --git a/tests/i2c/Cargo.toml b/tests/i2c/Cargo.toml index baf2d865..586ca465 100644 --- a/tests/i2c/Cargo.toml +++ b/tests/i2c/Cargo.toml @@ -12,6 +12,5 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler", "panic_handler_format" ] } -riot-sys = "*" +riot-wrappers = { path = "../..", features = [ "set_panic_handler", "panic_handler_format" ] } embedded-hal = "1" diff --git a/tests/led/Cargo.toml b/tests/led/Cargo.toml index 2c4604b7..291099c3 100644 --- a/tests/led/Cargo.toml +++ b/tests/led/Cargo.toml @@ -12,5 +12,5 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler" ] } switch-hal = "0.4" diff --git a/tests/mutex/Cargo.toml b/tests/mutex/Cargo.toml index 2afe1685..136001fe 100644 --- a/tests/mutex/Cargo.toml +++ b/tests/mutex/Cargo.toml @@ -12,4 +12,4 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler" ] } diff --git a/tests/random/Cargo.toml b/tests/random/Cargo.toml index 39da138e..2460a708 100644 --- a/tests/random/Cargo.toml +++ b/tests/random/Cargo.toml @@ -12,6 +12,6 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler", "panic_handler_format" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler", "panic_handler_format" ] } rand_core = "0.6" rngcheck = "0.1.1" diff --git a/tests/ztimer-async/Cargo.toml b/tests/ztimer-async/Cargo.toml index 69003069..7e503aa2 100644 --- a/tests/ztimer-async/Cargo.toml +++ b/tests/ztimer-async/Cargo.toml @@ -12,7 +12,7 @@ crate-type = ["staticlib"] panic = "abort" [dependencies] -riot-wrappers = { version = "*", features = [ "set_panic_handler", "panic_handler_format", "embedded-hal-async", "provide_critical_section_1_0" ] } +riot-wrappers = { path = "../..", features = [ "set_panic_handler", "panic_handler_format", "embedded-hal-async", "provide_critical_section_1_0" ] } embassy-executor-riot = { git = "https://gitlab.com/etonomy/riot-module-examples" } embassy-executor = "0.5.0" # Not enabling any of its executors: there's the -riot for that static_cell = "2" From 0e82f9f547f4282e9f6ed203b31bbb3b4b2d153d Mon Sep 17 00:00:00 2001 From: chrysn Date: Tue, 30 Jan 2024 09:04:01 +0100 Subject: [PATCH 2/3] cargo: Update riot-sys version to latest No tests are done regularly with old versions, so this is s safe thing to do. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e0afd64c..96d650c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ embedded-hal-0-2 = { package = "embedded-hal", version = "0.2.4", features = ["u embedded-hal = "1" switch-hal = "0.4.0" nb = "0.1.1" -riot-sys = "0.7.8" +riot-sys = "0.7.10" num-traits = { version = "0.2", default-features = false } mutex-trait = "0.2" From 239126bb0061ccc4cbe8cfe287089fc81b7b669a Mon Sep 17 00:00:00 2001 From: chrysn Date: Mon, 29 Jan 2024 22:00:49 +0100 Subject: [PATCH 3/3] Bump version * Add autoinit module. * Drop SUIT support. The module was in such disrepair in the previous that it was apparently not used. * SAUL: Compatibly follow renaming of G* units done in C * Add constants for common error values. * Add initializers based on peripheral numbers. * Add BOARD const. * gcoap: * Allow registration without scope for 'static listeners * Provide link encoder based on coap_handler::wkc * Support coap-message 0.3 / coap-handler 0.2 * Support embedded-hal 1.0 on selected modules. * Add tests for mutex and random. * Update riot-sys version. * Small refactorings. * Fixes to existing tests. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 96d650c4..45dda098 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "riot-wrappers" -version = "0.8.1" +version = "0.8.2" authors = ["Christian Amsüss "] edition = "2021" rust-version = "1.65"