Add d-phobos bench feature to reduce duplication

Author: mrmonday

bench/Cargo.toml

@@ -47,8 +47,9 @@ re-pcre1 = ["libpcre-sys"]
 re-pcre2 = []
 re-onig = ["onig"]
 re-re2 = []
-re-dphobos-dmd = []
-re-dphobos-ldc = []
+re-dphobos = []
+re-dphobos-dmd = ["re-dphobos"]
+re-dphobos-ldc = ["re-dphobos"]
 re-rust = []
 re-rust-bytes = []
 re-tcl = []

bench/src/bench.rs

@@ -37,8 +37,7 @@ pub use ffi::pcre1::Regex;
 pub use ffi::pcre2::Regex;
 #[cfg(feature = "re-re2")]
 pub use ffi::re2::Regex;
-#[cfg(any(feature = "re-dphobos-dmd",
-          feature = "re-dphobos-ldc"))]
+#[cfg(feature = "re-dphobos")]
 pub use ffi::d_phobos::Regex;
 #[cfg(feature = "re-rust")]
 pub use regex::Regex;
@@ -92,8 +91,7 @@ macro_rules! text {
     feature = "re-pcre1",
     feature = "re-pcre2",
     feature = "re-re2",
-    feature = "re-dphobos-ldc",
-    feature = "re-dphobos-dmd",
+    feature = "re-dphobos",
     feature = "re-rust",
   ))]
 macro_rules! text {
@@ -110,8 +108,7 @@ type Text = Vec<u8>;
     feature = "re-pcre1",
     feature = "re-pcre2",
     feature = "re-re2",
-    feature = "re-dphobos-ldc",
-    feature = "re-dphobos-dmd",
+    feature = "re-dphobos",
     feature = "re-rust",
   ))]
 type Text = String;

bench/src/ffi/mod.rs

@@ -12,8 +12,7 @@
 // of conditional compilation and such.
 #![allow(dead_code)]
 
-#[cfg(any(feature = "re-dphobos-dmd",
-          feature = "re-dphobos-ldc"))]
+#[cfg(feature = "re-dphobos")]
 pub mod d_phobos;
 #[cfg(feature = "re-onig")]
 pub mod onig;

bench/src/sherlock.rs

@@ -88,14 +88,12 @@ sherlock!(the_whitespace, r"the\s+\w+", 5410);
 
 // How fast can we match everything? This essentially defeats any clever prefix
 // tricks and just executes the DFA across the entire input.
-#[cfg(not(feature = "re-dphobos-dmd"))]
-#[cfg(not(feature = "re-dphobos-ldc"))]
+#[cfg(not(feature = "re-dphobos"))]
 #[cfg(not(feature = "re-pcre1"))]
 #[cfg(not(feature = "re-pcre2"))]
 #[cfg(not(feature = "re-tcl"))]
 sherlock!(everything_greedy, r".*", 13053);
-#[cfg(not(feature = "re-dphobos-dmd"))]
-#[cfg(not(feature = "re-dphobos-ldc"))]
+#[cfg(not(feature = "re-dphobos"))]
 #[cfg(not(feature = "re-onig"))]
 #[cfg(not(feature = "re-pcre1"))]
 #[cfg(not(feature = "re-pcre2"))]
@@ -152,15 +150,13 @@ sherlock!(quotes, r#"["'][^"']{0,30}[?!.]["']"#, 767);
 // Finds all occurrences of Sherlock Holmes at the beginning or end of a line.
 // The empty assertions defeat any detection of prefix literals, so it's the
 // lazy DFA the entire way.
-#[cfg(not(any(feature = "re-dphobos-dmd",
-              feature = "re-dphobos-ldc")))]
+#[cfg(not(feature = "re-dphobos"))]
 sherlock!(
     line_boundary_sherlock_holmes,
     r"(?m)^Sherlock Holmes|Sherlock Holmes$",
     34);
 // D matches both \r\n and \n as EOL
-#[cfg(any(feature = "re-dphobos-dmd",
-          feature = "re-dphobos-ldc"))]
+#[cfg(feature = "re-dphobos")]
 sherlock!(
     line_boundary_sherlock_holmes,
     r"(?m)^Sherlock Holmes|Sherlock Holmes$",