From c08d987123d830f38fe9c637e97071e958c9ec2d Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Wed, 15 Nov 2023 10:38:38 +0100 Subject: [PATCH] disable currently unsupported stuff --- Cargo.lock | 78 ++++++++++----------------- Cargo.toml | 2 +- examples/benchmark/src/main.rs | 2 +- examples/bottles/laze.yml | 1 + examples/laze.yml | 6 +++ examples/riot-app/laze.yml | 2 + examples/riot-wrappers-mutex/laze.yml | 1 + examples/rust-gcoap/laze.yml | 1 + laze-project.yml | 9 ++-- src/riot-rs-core/Cargo.toml | 2 +- src/riot-rs-core/laze.yml | 2 + src/riot-rs-rt/laze.yml | 2 + 12 files changed, 52 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ddfda86ad..9960b5dd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,15 +11,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "arrayvec" version = "0.7.4" @@ -226,9 +217,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cbindgen" -version = "0.15.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df6a11bba1d7cab86c166cecf4cf8acd7d02b7b65924d81b33d27197f22ee35" +checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" dependencies = [ "clap", "heck", @@ -286,17 +277,26 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "ansi_term", "atty", "bitflags 1.3.2", - "strsim 0.8.0", + "clap_lex", + "indexmap 1.9.3", + "strsim", + "termcolor", "textwrap", - "unicode-width", - "vec_map", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -523,7 +523,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 2.0.39", ] @@ -1099,12 +1099,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hello-world" @@ -1620,6 +1617,12 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + [[package]] name = "panic-semihosting" version = "0.6.0" @@ -2361,12 +2364,6 @@ dependencies = [ "precomputed-hash", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -2439,12 +2436,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" @@ -2502,12 +2496,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.11" @@ -2526,12 +2514,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" @@ -2682,7 +2664,3 @@ name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[patch.unused]] -name = "linkme" -version = "0.3.10" diff --git a/Cargo.toml b/Cargo.toml index 4c1189132..cf99463bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ repository = "https://github.com/future-proof-iot/riot-rs" [workspace.dependencies] cfg-if = { version = "1.0.0" } -cortex-m = { version = "0.7", default-features = false } +cortex-m = { version = "0.7", default-features = false, features = [ "inline-asm" ] } cortex-m-rt = { version = "0.7" } cortex-m-semihosting = { version = "0.5" } critical-section = { version = "1.1.2" } diff --git a/examples/benchmark/src/main.rs b/examples/benchmark/src/main.rs index fa0475ba5..0cd88f1bb 100644 --- a/examples/benchmark/src/main.rs +++ b/examples/benchmark/src/main.rs @@ -1,7 +1,7 @@ #![no_main] #![no_std] -use riot_rs::debug::println; +use riot_rs::rt::debug::println; #[no_mangle] fn riot_main() { diff --git a/examples/bottles/laze.yml b/examples/bottles/laze.yml index 878df0bef..15595e386 100644 --- a/examples/bottles/laze.yml +++ b/examples/bottles/laze.yml @@ -1,6 +1,7 @@ apps: - name: bottles selects: + - riot-c - release env: global: diff --git a/examples/laze.yml b/examples/laze.yml index 96f3242e6..24e094a22 100644 --- a/examples/laze.yml +++ b/examples/laze.yml @@ -1,8 +1,14 @@ +defaults: + apps: + context: + - riot-rs + subdirs: - benchmark - bottles - core-sizes - embassy + # - embassy-gpio - hello-world - minimal - riot-app diff --git a/examples/riot-app/laze.yml b/examples/riot-app/laze.yml index fd7c277ef..15f9aae43 100644 --- a/examples/riot-app/laze.yml +++ b/examples/riot-app/laze.yml @@ -1,6 +1,7 @@ apps: - name: riot-app selects: + - riot-c - ?release env: global: @@ -11,6 +12,7 @@ apps: - name: riot-appdir selects: + - riot-c - ?release env: global: diff --git a/examples/riot-wrappers-mutex/laze.yml b/examples/riot-wrappers-mutex/laze.yml index 815a3abd7..bcd99b417 100644 --- a/examples/riot-wrappers-mutex/laze.yml +++ b/examples/riot-wrappers-mutex/laze.yml @@ -1,4 +1,5 @@ apps: - name: riot-wrappers-mutex selects: + - riot-c - ?release diff --git a/examples/rust-gcoap/laze.yml b/examples/rust-gcoap/laze.yml index 75a849dbe..288c78bd6 100644 --- a/examples/rust-gcoap/laze.yml +++ b/examples/rust-gcoap/laze.yml @@ -1,6 +1,7 @@ apps: - name: rust-gcoap selects: + - riot-c - ?release env: global: diff --git a/laze-project.yml b/laze-project.yml index 9de7ca771..97d07f527 100644 --- a/laze-project.yml +++ b/laze-project.yml @@ -7,9 +7,6 @@ contexts: # base context for all RIOT-rs applications - name: riot-rs - selects: - - ?newlib - - riot-sources env: RUSTFLAGS: @@ -419,6 +416,12 @@ modules: selects: - riot_libc|newlib + - name: riot-c + selects: + - "riot-c-currently-unsupported" + - ?newlib + - riot-sources + - name: newlib context: riot-rs env: diff --git a/src/riot-rs-core/Cargo.toml b/src/riot-rs-core/Cargo.toml index 5fe34176b..76902b350 100644 --- a/src/riot-rs-core/Cargo.toml +++ b/src/riot-rs-core/Cargo.toml @@ -17,7 +17,7 @@ ringbuffer = { path = "../lib/ringbuffer" } thread_info = [] [build-dependencies] -cbindgen = "0.15.*" +cbindgen = "0.26.*" [dev-dependencies] riot-rs-rt = { path = "../riot-rs-rt" } diff --git a/src/riot-rs-core/laze.yml b/src/riot-rs-core/laze.yml index a6f24d0ac..2c7428308 100644 --- a/src/riot-rs-core/laze.yml +++ b/src/riot-rs-core/laze.yml @@ -1 +1,3 @@ apps: + - selects: + - "disabled_until_test_framework_fixed" diff --git a/src/riot-rs-rt/laze.yml b/src/riot-rs-rt/laze.yml index a6f24d0ac..2c7428308 100644 --- a/src/riot-rs-rt/laze.yml +++ b/src/riot-rs-rt/laze.yml @@ -1 +1,3 @@ apps: + - selects: + - "disabled_until_test_framework_fixed"