language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Minor clippy perf fixes

Browse source
This commit is contained in:
Laurențiu Nicola 2021-06-18 14:40:51 +03:00
parent 0d863ccea9
commit e3ce88f6f2
11 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/proc_macro_api/src/version.rs
View file

@ -28,23 +28,23 @@ pub fn read_dylib_info(dylib_path: &Path) -> io::Result<RustCInfo> {
let ver_str = read_version(dylib_path)?;
let mut items = ver_str.split_whitespace();
let tag = items.next().ok_or(err!("version format error"))?;
let tag = items.next().ok_or_else(|| err!("version format error"))?;
if tag != "rustc" {
return Err(err!("version format error (No rustc tag)"));
}
let version_part = items.next().ok_or(err!("no version string"))?;
let version_part = items.next().ok_or_else(|| err!("no version string"))?;
let mut version_parts = version_part.split('-');
let version = version_parts.next().ok_or(err!("no version"))?;
let version = version_parts.next().ok_or_else(|| err!("no version"))?;
let channel = version_parts.next().unwrap_or_default().to_string();
let commit = items.next().ok_or(err!("no commit info"))?;
let commit = items.next().ok_or_else(|| err!("no commit info"))?;
// remove (
if commit.len() == 0 {
return Err(err!("commit format error"));
}
let commit = commit[1..].to_string();
let date = items.next().ok_or(err!("no date info"))?;
let date = items.next().ok_or_else(|| err!("no date info"))?;
// remove )
if date.len() == 0 {
return Err(err!("date format error"));