Skip to content

Commit f013d5f

Browse files
committed
Revert "read version from manifest first"
This reverts commit 2deedec.
1 parent 0c41e41 commit f013d5f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/info/version.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ impl VersionInfo {
1717
}
1818

1919
fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String> {
20-
if let Some(m) = manifest {
21-
if !m.version.is_empty() {
22-
return Ok(m.version.clone());
23-
}
24-
}
25-
2620
let mut version = String::new();
2721
let mut most_recent = 0;
2822

@@ -36,7 +30,15 @@ fn get_version(repo: &Repository, manifest: Option<&Manifest>) -> Result<String>
3630
}
3731
}
3832

39-
Ok(version)
33+
if version.is_empty() {
34+
let version_from_manifest = match manifest {
35+
Some(m) => m.version.clone(),
36+
None => String::new(),
37+
};
38+
Ok(version_from_manifest)
39+
} else {
40+
Ok(version)
41+
}
4042
}
4143

4244
#[typetag::serialize]

0 commit comments

Comments
 (0)