Skip to content
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.

Sign up for GitHub

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

Make the build script run in stable Rust - use option methods #7

Closed
wants to merge 1 commit into from
Closed

Make the build script run in stable Rust - use option methods #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions libbzip3-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(try_blocks)]

extern crate bindgen;

use cfg_if::cfg_if;
Expand Down Expand Up @@ -82,14 +80,17 @@ mod bundled {
news_file.read_to_string(&mut read).unwrap();
drop(news_file);

let version: Option<String> = try {
let version: Option<String> = {
let version_regex = Regex::new(r#"^v([0-9]+\.[0-9]+\.[0-9]+):$"#).unwrap();
let mut lines = read.lines();
let last = lines.rfind(|x| version_regex.is_match(x))?;

let version = version_regex.captures_iter(last).next()?.get(1)?.as_str();
version.into()
lines
.rfind(|x| version_regex.is_match(x))
.and_then(|last_line| version_regex.captures_iter(last_line).next())
.and_then(|last_line_captures| last_line_captures.get(1))
.map(|capture| capture.as_str().into())
};

version.expect("Cannot find library version from NEWS file")
}

Expand Down