Skip to content
Draft
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
11 changes: 6 additions & 5 deletions src/bin/set-version/set_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,12 @@ fn exec(args: VersionArgs) -> CargoResult<()> {
unstable_features: _,
} = args;

let target = match (target, bump) {
(None, None) => TargetVersion::Relative(BumpLevel::Release),
(None, Some(level)) => TargetVersion::Relative(level),
(Some(version), None) => TargetVersion::Absolute(version),
(Some(_), Some(_)) => unreachable!("clap groups should prevent this"),
let target = match (target, bump, &metadata) {
(None, None, Some(_)) => TargetVersion::Unchanged,
(None, None, None) => TargetVersion::Relative(BumpLevel::Release),
(None, Some(level), _) => TargetVersion::Relative(level),
(Some(version), None, _) => TargetVersion::Absolute(version),
(Some(_), Some(_), _) => unreachable!("clap groups should prevent this"),
};

let ws_metadata = resolve_ws(manifest_path.as_deref(), locked, offline)?;
Expand Down
8 changes: 8 additions & 0 deletions src/bin/set-version/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::errors::*;
pub enum TargetVersion {
Relative(BumpLevel),
Absolute(semver::Version),
Unchanged,
}

impl TargetVersion {
Expand All @@ -17,6 +18,13 @@ impl TargetVersion {
metadata: Option<&str>,
) -> CargoResult<Option<semver::Version>> {
match self {
TargetVersion::Unchanged => {
let mut potential_version = current.to_owned();
if let Some(metadata) = metadata {
potential_version.metadata(metadata)?;
};
Ok(Some(potential_version))
}
TargetVersion::Relative(bump_level) => {
let mut potential_version = current.to_owned();
bump_level.bump_version(&mut potential_version, metadata)?;
Expand Down
3 changes: 3 additions & 0 deletions src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,9 @@ mod test {
let mut v = semver::Version::parse("1.0.0").unwrap();
v.metadata("git.123456").unwrap();
assert_eq!(v, semver::Version::parse("1.0.0+git.123456").unwrap());
let mut v = semver::Version::parse("1.0.0-dev10").unwrap();
v.metadata("git.123456").unwrap();
assert_eq!(v, semver::Version::parse("1.0.0-dev10+git.123456").unwrap());
}
}

Expand Down
2 changes: 2 additions & 0 deletions tests/cargo-set-version/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ mod ignore_dependent;
mod relative_absolute_conflict;
mod set_absolute_version;
mod set_absolute_workspace_version;
mod set_metadata;
mod set_relative_release;
mod set_relative_version;
mod set_relative_workspace_version;
mod upgrade_compatible_dependency;
Expand Down