From a5c9ac2e95ef23fd82cdca6e9bc2398fd6a00256 Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Wed, 20 Mar 2024 19:40:20 +1000
Subject: [PATCH]  rust: Make dependencies visible

The Cargo.lock of rust_riotmodules_standalone should explicitly list all
versions of software that would ever be pulled in by enabling RIOT
modules backed by a Rust crate. That way, the Cargo.lock file will not
spontaneously change because the software is being built with a
different set of modules enabled.

This did not happen before, because while the optional dependencies
could all be selected on the command line, they were not visible as
possible features to `cargo update`, and were thus not encoded in the
Cargo.lock file.
---
 sys/rust_riotmodules/Cargo.toml            |   5 +++++
 sys/rust_riotmodules_standalone/Cargo.lock | Bin 23236 -> 23804 bytes
 sys/rust_riotmodules_standalone/Cargo.toml |   8 ++++++++
 3 files changed, 13 insertions(+)

diff --git a/sys/rust_riotmodules/Cargo.toml b/sys/rust_riotmodules/Cargo.toml
index 45fe52acbe..b8de794176 100644
--- a/sys/rust_riotmodules/Cargo.toml
+++ b/sys/rust_riotmodules/Cargo.toml
@@ -12,3 +12,8 @@ publish = false
 
 riot-module-lsm303agr = { path = "../../drivers/lsm303agr", optional = true }
 riot-module-shell-democommands = { path = "../../sys/shell/democommands", optional = true }
+
+[features]
+# This feature is just there so that rust_riotmodules_standalone can use its
+# _all; see documentation there.
+_all = [ "riot-module-lsm303agr", "riot-module-shell-democommands"]
diff --git a/sys/rust_riotmodules_standalone/Cargo.lock b/sys/rust_riotmodules_standalone/Cargo.lock
index de525237718f12a752ee1eb0955c0c70d6d1ec8d..17d47da24b22cc853dad72ab969ad2e2e00e6576 100644
GIT binary patch
delta 282
zcmX@ImGRF`#tmz=Idh70jSY+w(~Bnm;YoBzF-Zh+l2Z%}Q;f`$Et3;1&5{x=j0{Z8
z%?!-UjT4QGlM)Rr4NX!kOp}uh3{owP63r3~OfAifQ%uuREt4iEI*3m0Vd0z{>&QJh
z%~ovkT0N!BYqg{J1#<IKN^??m5!UtDsY}6mN;+H$N=2FZCA#HBi3J6zMUxwaq~*W@
zP>sbIsW~~iDXF>n$@#gtiFql-ll$z<C$|cTZ)UQNVV<1qAZ(7T9*fbqOaj?8*~(5}
JbF-bJ3;?PiUhn__

delta 28
kcmeyflkvz_#tmz=H}BAi;@|w<CY*V)v4-g8)eeC&0K{nv{{R30

diff --git a/sys/rust_riotmodules_standalone/Cargo.toml b/sys/rust_riotmodules_standalone/Cargo.toml
index b5077eb24d..61d3139873 100644
--- a/sys/rust_riotmodules_standalone/Cargo.toml
+++ b/sys/rust_riotmodules_standalone/Cargo.toml
@@ -19,3 +19,11 @@ codegen-units = 1
 riot-wrappers = { version = "0.8", features = [ "set_panic_handler" ] }
 
 rust_riotmodules = { path = "../rust_riotmodules" }
+
+[features]
+# By having this explicit feature (comapred to what is enabled by the build
+# system as `--features rust_riotmodules/foo`), all possible dependencies are
+# visible to `cargo update` and in `Cargo.lock. This should not be enabled for
+# compilation, as the modules behind it likely have their own RIOT modules they
+# need enabled.
+_all = [ "rust_riotmodules/_all" ]