Skip to content

proc_macro_api: make commit & date suffix of binary version optional #9936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions crates/proc_macro_api/src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use snap::read::FrameDecoder as SnapDecoder;
pub struct RustCInfo {
pub version: (usize, usize, usize),
pub channel: String,
pub commit: String,
pub date: String,
pub commit: Option<String>,
pub date: Option<String>,
}

/// Read rustc dylib information
Expand All @@ -38,18 +38,24 @@ pub fn read_dylib_info(dylib_path: &AbsPath) -> io::Result<RustCInfo> {
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_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_else(|| err!("no date info"))?;
// remove )
if date.len() == 0 {
return Err(err!("date format error"));
}
let date = date[0..date.len() - 2].to_string();
let commit = match items.next() {
Some(commit) => {
match commit.len() {
0 => None,
_ => Some(commit[1..].to_string() /* remove ( */),
}
}
None => None,
};
let date = match items.next() {
Some(date) => {
match date.len() {
0 => None,
_ => Some(date[0..date.len() - 2].to_string() /* remove ) */),
}
}
None => None,
};

let version_numbers = version
.split('.')
Expand Down