From 05b4749ae742f6b75171f04f6f1c0fadff543db7 Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 3 Nov 2022 18:05:26 +0100 Subject: [PATCH] rust: Run all examples on stable This is possible starting with Rust 1.65. --- examples/rust-gcoap/Makefile | 3 +-- examples/rust-hello-world/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/rust-gcoap/Makefile b/examples/rust-gcoap/Makefile index 6e067775a5..bc912e5d3f 100644 --- a/examples/rust-gcoap/Makefile +++ b/examples/rust-gcoap/Makefile @@ -41,8 +41,7 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module FEATURES_REQUIRED += rust_target -# This example requires a nightly version because of the CoAP dependencies -CARGO_CHANNEL ?= ${CARGO_CHANNEL_NIGHTLY} +CARGO_CHANNEL ?= stable # Currently unknown, something related to the LED_PORT definition that doesn't # pass C2Rust's transpilation diff --git a/examples/rust-hello-world/Makefile b/examples/rust-hello-world/Makefile index 9c175e73eb..b0f4f15ccf 100644 --- a/examples/rust-hello-world/Makefile +++ b/examples/rust-hello-world/Makefile @@ -21,10 +21,10 @@ BASELIBS += $(APPLICATION_RUST_MODULE).module FEATURES_REQUIRED += rust_target -# While this example can be built with stable Rust on many platforms, the -# nightly channel is selected to smoothly transition from running this example -# to experimenting with it (which might easily lead into nightly territory). -CARGO_CHANNEL ?= $(CARGO_CHANNEL_NIGHTLY) +# All Rust components RIOT uses work on stable Rust. If any extra libraries +# were to require a more recent version, switch to `CARGO_CHANNEL = +# $(CARGO_CHANNEL_NIGHTLY)` to use whichever nightly version is available. +CARGO_CHANNEL ?= stable # Currently unknown, something related to the LED_PORT definition that doesn't # pass C2Rust's transpilation