language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-01 21:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate todo!()s

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-12-20 18:47:50 +09:00
parent 5b01c048af
commit 7d25c1b54d
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/erg_common/python_util.rs
View file

@ -624,9 +624,9 @@ impl std::str::FromStr for PythonVersion {
fn from_str(s: &str) -> Result<Self, Self::Err> {
let mut iter = s.split('.');
let major = iter.next().unwrap().parse::<u8>().unwrap_or(3);
let minor = iter.next().and_then(|i| i.parse::<u8>().ok());
let micro = iter.next().and_then(|i| i.parse::<u8>().ok());
let major = iter.next().and_then(|i| i.parse().ok()).unwrap_or(3);
let minor = iter.next().and_then(|i| i.parse().ok());
let micro = iter.next().and_then(|i| i.parse().ok());
Ok(Self::new(major, minor, micro))
}
}
@ -652,9 +652,9 @@ pub fn get_python_version(py_command: &str) -> PythonVersion {
};
let s_version = String::from_utf8(out.stdout).unwrap();
let mut iter = s_version.split(' ');
let major = iter.next().unwrap().parse().unwrap();
let minor = iter.next().and_then(|i| i.parse::<u8>().ok());
let micro = iter.next().and_then(|i| i.trim_end().parse::<u8>().ok());
let major = iter.next().and_then(|i| i.parse().ok()).unwrap_or(3);
let minor = iter.next().and_then(|i| i.parse().ok());
let micro = iter.next().and_then(|i| i.trim_end().parse().ok());
PythonVersion {
major,
minor,