|
|
|
|
@ -17,12 +17,6 @@ impl VersionInfo {
@@ -17,12 +17,6 @@ impl VersionInfo {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String> { |
|
|
|
|
if let Some(m) = manifest { |
|
|
|
|
if !m.version.is_empty() { |
|
|
|
|
return Ok(m.version.clone()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
let mut version = String::new(); |
|
|
|
|
let mut most_recent = 0; |
|
|
|
|
|
|
|
|
|
@ -36,7 +30,15 @@ fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String>
@@ -36,7 +30,15 @@ fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String>
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Ok(version) |
|
|
|
|
if version.is_empty() { |
|
|
|
|
let version_from_manifest = match manifest { |
|
|
|
|
Some(m) => m.version.clone(), |
|
|
|
|
None => String::new(), |
|
|
|
|
}; |
|
|
|
|
Ok(version_from_manifest) |
|
|
|
|
} else { |
|
|
|
|
Ok(version) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
#[typetag::serialize] |
|
|
|
|
|