Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 60 additions & 4 deletions src/toolset/tool_version_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,22 @@ impl ToolVersionOptions {

pub fn parse_tool_options(s: &str) -> ToolVersionOptions {
let mut tvo = ToolVersionOptions::default();
let mut current_key: Option<String> = None;
for opt in s.split(',') {
let (k, v) = opt.split_once('=').unwrap_or((opt, ""));
if k.is_empty() {
continue;
if let Some((k, v)) = opt.split_once('=') {
if !k.trim().is_empty() {
tvo.opts.insert(k.trim().to_string(), v.to_string());
current_key = Some(k.trim().to_string());
}
} else if !opt.is_empty() {
// No '=' found, append to the previous value or create a new key
if let Some(key) = &current_key
&& let Some(existing_value) = tvo.opts.get_mut(key)
{
existing_value.push(',');
existing_value.push_str(opt);
Comment thread
roele marked this conversation as resolved.
}
}
Comment thread
roele marked this conversation as resolved.
tvo.opts.insert(k.to_string(), v.to_string());
}
tvo
}
Expand Down Expand Up @@ -209,6 +219,52 @@ mod tests {
..Default::default()
},
);
t(
"profile=minimal,components=rust-src,llvm-tools,targets=wasm32-unknown-unknown,thumbv2-none-eabi",
ToolVersionOptions {
opts: [
("profile".to_string(), "minimal".to_string()),
("components".to_string(), "rust-src,llvm-tools".to_string()),
(
"targets".to_string(),
"wasm32-unknown-unknown,thumbv2-none-eabi".to_string(),
),
]
.iter()
.cloned()
.collect(),
..Default::default()
},
);
// test trimming of key whitespace
t(
" exe = rg , match = musl ",
ToolVersionOptions {
opts: [
("exe".to_string(), " rg ".to_string()),
("match".to_string(), " musl ".to_string()),
]
.iter()
.cloned()
.collect(),
..Default::default()
},
);
// test value-less keys
t(
"foo=,bar=baz,baz=",
ToolVersionOptions {
opts: [
("foo".to_string(), "".to_string()),
("bar".to_string(), "baz".to_string()),
("baz".to_string(), "".to_string()),
]
.iter()
.cloned()
.collect(),
..Default::default()
},
);
}

#[test]
Expand Down
Loading