bench: update the benchmark runner

This updates dependencies and makes sure everything compiles and runs.
This also simplifies the build script.

Author: BurntSushi

bench/Cargo.toml

@@ -12,20 +12,20 @@ build = "build.rs"
 workspace = ".."
 
 [dependencies]
-docopt = "0.6"
-lazy_static = "0.1"
+docopt = "0.8"
+lazy_static = "1"
 libc = "0.2"
-onig = { version = "1.2", optional = true }
+onig = { version = "3", optional = true }
 libpcre-sys = { version = "0.2", optional = true }
 memmap = "0.2"
 regex = { version = "0.2.0", path = "..", features = ["simd-accel"] }
-regex_macros = { version = "0.2.0", path = "../regex_macros", optional = true }
 regex-syntax = { version = "0.4.0", path = "../regex-syntax" }
-rustc-serialize = "0.3"
+serde = "1"
+serde_derive = "1"
 
 [build-dependencies]
-gcc = "0.3"
-pkg-config = "0.3"
+cc = "1"
+pkg-config = "0.3.9"
 
 [[bin]]
 name = "regex-run-one"
@@ -41,8 +41,7 @@ bench = false
 # Doing anything else will probably result in weird "duplicate definition"
 # compiler errors.
 #
-# Tip: use the run-bench script in the root of this repository to run
-# benchmarks.
+# Tip: use the run script in this directory to run benchmarks.
 [features]
 re-pcre1 = ["libpcre-sys"]
 re-pcre2 = []

bench/build.rs

@@ -8,51 +8,26 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate gcc;
+extern crate cc;
 extern crate pkg_config;
 
 use std::env;
-use std::process;
-
-macro_rules! we {
-    ($($tt:tt)*) => {{
-        use std::io::Write;
-        writeln!(&mut ::std::io::stderr(), $($tt),*).unwrap();
-    }}
-}
 
 fn main() {
-    // We only need to look for PCRE2 and RE2 because we roll the FFI bindings
-    // for those libraries ourselves from scratch. For PCRE1 and Oniguruma, we
-    // rely on other crates that do something similar to the dance below for
-    // us.
-
-    let wants_pcre2 = env::var("CARGO_FEATURE_RE_PCRE2").is_ok();
-    let has_pcre2 = pkg_config::Config::new().find("libpcre2-8").is_ok();
-    if wants_pcre2 && !has_pcre2 {
-        we!("pcre2 cannot be found by pkg-config");
-        process::exit(1);
+    if env::var("CARGO_FEATURE_RE_PCRE2").is_ok() {
+        pkg_config::probe_library("libpcre2-8").unwrap();
     }
-
-    let wants_re2 = env::var("CARGO_FEATURE_RE_RE2").is_ok();
-    let has_re2 = pkg_config::Config::new().find("re2").is_ok();
-    if wants_re2 {
-        if !has_re2 {
-            we!("re2 cannot be found by pkg-config");
-            process::exit(1);
-        }
-        gcc::Config::new()
+    if env::var("CARGO_FEATURE_RE_RE2").is_ok() {
+        // RE2 is a C++ library, so we need to compile our shim layer.
+        cc::Build::new()
             .cpp(true)
-            .flag("-std=c++11")
             .file("src/ffi/re2.cpp")
             .compile("libcre2.a");
-        println!("cargo:rustc-link-lib=re2");
+        // It's important this comes after compiling the shim, which results
+        // in the correct order of arguments given to the linker.
+        pkg_config::probe_library("re2").unwrap();
     }
-
-    let wants_tcl = env::var("CARGO_FEATURE_RE_TCL").is_ok();
-    let has_tcl = pkg_config::Config::new().find("tcl").is_ok();
-    if wants_tcl && !has_tcl {
-        we!("tcl cannot be found by pkg-config");
-        process::exit(1);
+    if env::var("CARGO_FEATURE_RE_TCL").is_ok() {
+        pkg_config::probe_library("tcl").unwrap();
     }
 }

bench/run

@@ -23,7 +23,7 @@ case $which in
     exec cargo bench --bench bench --features re-rust-bytes "$@"
     ;;
   re2)
-    exec cargo bench --bench bench --features re-re2 "$@"
+    exec cargo bench --verbose --bench bench --features re-re2 "$@"
     ;;
   pcre1)
     exec cargo bench --bench bench --features re-pcre1 "$@"

bench/src/ffi/onig.rs

@@ -22,7 +22,12 @@ impl Regex {
     pub fn is_match(&self, text: &str) -> bool {
         // Gah. onig's is_match function is anchored, but find is not.
         self.0.search_with_options(
-            text, 0, text.len(), onig::SEARCH_OPTION_NONE, None).is_some()
+            text,
+            0,
+            text.len(),
+            onig::SearchOptions::SEARCH_OPTION_NONE,
+            None,
+        ).is_some()
     }
 
     pub fn find_iter<'r, 't>(

bench/src/ffi/re2.cpp

@@ -1,7 +1,7 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "re2.h"
+#include "re2/re2.h"
 
 using namespace re2;