openharmony/third_party_rust_version_check
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_version_check synced 2024-11-23 07:49:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify 'Version::to_mmp()'.

Browse Source
This commit is contained in:
Sergio Benitez 2021-03-16 10:32:09 -07:00
parent d0e8ad075a
commit 2f9b700d82
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/version.rs
View File

@ -59,13 +59,13 @@ impl Version {
.nth(0) .nth(0)
.unwrap_or("") .unwrap_or("")
.split('.') .split('.')
.map(|s| s.parse::<u16>().ok()); .map(|s| s.parse::<u16>());
let mut mmp = [0u16; 3]; let mut mmp = [0u16; 3];
for (i, split) in splits.enumerate() { for (i, split) in splits.enumerate() {
mmp[i] = match (i, split) { mmp[i] = match (i, split) {
(3, _) | (_, None) => return None, (3, _) | (_, Err(_)) => return None,
(_, Some(v)) => v, (_, Ok(v)) => v,
}; };
} }
@ -103,8 +103,8 @@ impl Version {
/// ``` /// ```
pub fn to_mmp(&self) -> (u16, u16, u16) { pub fn to_mmp(&self) -> (u16, u16, u16) {
let major = self.0 >> 32; let major = self.0 >> 32;
let minor = (self.0 << 32) >> 48; let minor = self.0 >> 16;
let patch = (self.0 << 48) >> 48; let patch = self.0;
(major as u16, minor as u16, patch as u16) (major as u16, minor as u16, patch as u16)
} }