Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"rust-analyzer.rustfmt.overrideCommand": [
"rustfmt",
// Keep in sync with across other repos like operator-rs and operator-templating
"+nightly-2025-05-26",
"+nightly-2025-10-23",
"--edition",
"2024",
"--"
Expand Down
40 changes: 38 additions & 2 deletions rust/boil/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,13 @@ impl VersionExt for Version {

fn base_prerelease(&self) -> String {
let mut base = self.base();
base.push('-');
base.push_str(&self.pre);

// Well, that was a big doozy, ruined the whole release...
if !self.pre.is_empty() {
base.push('-');
base.push_str(&self.pre);
}

base
}
}
Expand Down Expand Up @@ -110,3 +115,34 @@ async fn main() -> Result<(), Error> {
}
}
}

#[cfg(test)]
mod tests {
use rstest::rstest;

use super::*;

#[rstest]
#[case("25.11.0-rc.1+arm64", "25.11.0-rc.1")]
#[case("25.11.0-rc.1", "25.11.0-rc.1")]
#[case("25.11.0-rc1", "25.11.0-rc1")]
#[case("0.0.0-dev", "0.0.0-dev")]
#[case("25.11.0", "25.11.0")]
#[case("0.0.0", "0.0.0")]
fn version_ext_base_prerelease(#[case] input: &str, #[case] expected: &str) {
let version: Version = input.parse().expect("must be a valid semantic version");
assert_eq!(version.base_prerelease(), expected);
}

#[rstest]
#[case("25.11.0-rc.1+arm64", "25.11.0")]
#[case("25.11.0-rc.1", "25.11.0")]
#[case("25.11.0-rc1", "25.11.0")]
#[case("0.0.0-dev", "0.0.0")]
#[case("25.11.0", "25.11.0")]
#[case("0.0.0", "0.0.0")]
fn version_ext_base(#[case] input: &str, #[case] expected: &str) {
let version: Version = input.parse().expect("must be a valid semantic version");
assert_eq!(version.base(), expected);
}
}