Skip to content
Closed
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update package_version.rs
- Renamed VersionRelease to ReleaseHeader
- Added ReleaseHeader unit tests
  • Loading branch information
Allstreamer committed Aug 10, 2022
commit 66e307c2c8e2973cdbd8a9681af98e294e6d4c13
28 changes: 23 additions & 5 deletions src/package_version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ pub enum PreHeader {

/// Tracks Major and Minor Version Numbers
#[derive(Debug, Serialize, Deserialize, Eq, PartialEq, PartialOrd)]
pub struct VersionRelease {
pub struct ReleaseHeader {
/// Major release such as 1.0 or breaking changes
pub major: u32,
/// Minor release Such as new functionality
Expand All @@ -120,7 +120,7 @@ pub struct VersionRelease {
pub struct PackageVersion {
pub original: String,
pub epoch: Option<u32>,
pub release: VersionRelease,
pub release: ReleaseHeader,
pub pre: Option<PreHeader>,
pub post: Option<PostHeader>,
pub dev: Option<DevHead>,
Expand All @@ -146,16 +146,16 @@ impl PackageVersion {
None => None,
};

let release: VersionRelease = match version_match.name("release") {
let release: ReleaseHeader = match version_match.name("release") {
Some(v) => {
if v.as_str().contains(".") {
let split: Vec<&str> = v.as_str().split(".").into_iter().collect();
VersionRelease {
ReleaseHeader {
major: split[0].parse::<u32>()?,
minor: split[1].parse::<u32>()?,
}
} else {
VersionRelease {
ReleaseHeader {
major: v.as_str().parse::<u32>()?,
minor: 0,
}
Expand Down Expand Up @@ -276,6 +276,7 @@ mod tests {
use super::PostHead;
use super::PostHeader;
use super::PreHeader;
use super::ReleaseHeader;

fn check_a_greater<T>(a: T, b: T) -> Result<()>
where
Expand All @@ -291,6 +292,23 @@ mod tests {
Ok(())
}

#[test]
fn check_release_ordering() -> Result<()> {
check_a_greater(
ReleaseHeader { major: 1, minor: 0 },
ReleaseHeader { major: 0, minor: 0 },
)?;
check_a_greater(
ReleaseHeader { major: 1, minor: 1 },
ReleaseHeader { major: 1, minor: 0 },
)?;
check_a_greater(
ReleaseHeader { major: 2, minor: 1 },
ReleaseHeader { major: 1, minor: 1 },
)?;
Ok(())
}

#[test]
fn check_pre_ordering() -> Result<()> {
check_a_greater(PreHeader::ReleaseCanidate(None), PreHeader::Preview(None))?;
Expand Down