Skip to content

Commit

Permalink
build: Move away from deprecated shlex function
Browse files Browse the repository at this point in the history
  • Loading branch information
chrysn committed Jan 30, 2024
1 parent 0e64a42 commit 870cf53
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ riot-rs-core = { version = "< 0.2.0", optional = true }

[build-dependencies]
bindgen = "^0.64"
shlex = "^1"
shlex = "^1.3"
serde_json = "1"
serde = { version = "1", features = [ "derive" ] }
regex = "1"
Expand Down
3 changes: 2 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ fn main() {
cc = consensus_cc
.expect("Entries are present in compile_commands.json")
.to_string();
cflags = shlex::join(consensus_cflag_groups.unwrap().iter().flatten().map(|s| *s));
cflags = shlex::try_join(consensus_cflag_groups.unwrap().iter().flatten().map(|s| *s))
.expect("Input is not expected to contain NUL characters");

let usemodule = {
#[cfg(not(feature = "riot-rs"))]
Expand Down

0 comments on commit 870cf53

Please sign in to comment.