progress

Author: BurntSushi

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "regex"
+name = "regex-old"
 version = "1.6.0"  #:version
 authors = ["The Rust Project Developers"]
 license = "MIT OR Apache-2.0"
@@ -32,7 +32,7 @@ doctest = false
 # Features are documented in the "Crate features" section of the crate docs:
 # https://docs.rs/regex/*/#crate-features
 [features]
-default = ["std", "perf", "unicode", "regex-syntax/default"]
+default = ["std", "perf", "unicode", "regex-syntax-old/default"]
 
 # ECOSYSTEM FEATURES
 
@@ -75,22 +75,22 @@ unicode = [
   "unicode-perl",
   "unicode-script",
   "unicode-segment",
-  "regex-syntax/unicode",
+  "regex-syntax-old/unicode",
 ]
 # Enables use of the `Age` property, e.g., `\p{Age:3.0}`.
-unicode-age = ["regex-syntax/unicode-age"]
+unicode-age = ["regex-syntax-old/unicode-age"]
 # Enables use of a smattering of boolean properties, e.g., `\p{Emoji}`.
-unicode-bool = ["regex-syntax/unicode-bool"]
+unicode-bool = ["regex-syntax-old/unicode-bool"]
 # Enables Unicode-aware case insensitive matching, e.g., `(?i)β`.
-unicode-case = ["regex-syntax/unicode-case"]
+unicode-case = ["regex-syntax-old/unicode-case"]
 # Enables Unicode general categories, e.g., `\p{Letter}` or `\pL`.
-unicode-gencat = ["regex-syntax/unicode-gencat"]
+unicode-gencat = ["regex-syntax-old/unicode-gencat"]
 # Enables Unicode-aware Perl classes corresponding to `\w`, `\s` and `\d`.
-unicode-perl = ["regex-syntax/unicode-perl"]
+unicode-perl = ["regex-syntax-old/unicode-perl"]
 # Enables Unicode scripts and script extensions, e.g., `\p{Greek}`.
-unicode-script = ["regex-syntax/unicode-script"]
+unicode-script = ["regex-syntax-old/unicode-script"]
 # Enables Unicode segmentation properties, e.g., `\p{gcb=Extend}`.
-unicode-segment = ["regex-syntax/unicode-segment"]
+unicode-segment = ["regex-syntax-old/unicode-segment"]
 
 
 # UNSTABLE FEATURES (requires Rust nightly)
@@ -115,7 +115,7 @@ version = "2.4.0"
 optional = true
 
 # For parsing regular expressions.
-[dependencies.regex-syntax]
+[dependencies.regex-syntax-old]
 path = "regex-syntax"
 version = "0.6.27"
 default-features = false

bench/Cargo.toml

@@ -19,8 +19,8 @@ libc = "0.2"
 onig = { version = "3", optional = true }
 libpcre-sys = { version = "0.2", optional = true }
 memmap = "0.6.2"
-regex = { version = "1", path = ".." }
-regex-syntax = { version = "0.6", path = "../regex-syntax" }
+regex-old = { version = "1", path = ".." }
+regex-syntax-old = { version = "0.6", path = "../regex-syntax" }
 serde = { version = "1", features = ["derive"] }
 cfg-if = "0.1"
 

bench/src/bench.rs

@@ -14,9 +14,9 @@ cfg_if! {
     } else if #[cfg(feature = "re-onig")] {
         pub use ffi::onig::Regex;
     } else if #[cfg(any(feature = "re-rust"))] {
-        pub use regex::{Regex, RegexSet};
+        pub use regex_old::{Regex, RegexSet};
     } else if #[cfg(feature = "re-rust-bytes")] {
-        pub use regex::bytes::{Regex, RegexSet};
+        pub use regex_old::bytes::{Regex, RegexSet};
     } else if #[cfg(feature = "re-re2")] {
         pub use ffi::re2::Regex;
     } else if #[cfg(feature = "re-pcre2")] {

bench/src/main.rs

@@ -116,14 +116,14 @@ fn count_re2(pat: &str, haystack: &str) -> usize {
 nada!("re-rust", count_rust);
 #[cfg(feature = "re-rust")]
 fn count_rust(pat: &str, haystack: &str) -> usize {
-    use regex::Regex;
+    use regex_old::Regex;
     Regex::new(pat).unwrap().find_iter(haystack).count()
 }
 
 nada!("re-rust-bytes", count_rust_bytes);
 #[cfg(feature = "re-rust-bytes")]
 fn count_rust_bytes(pat: &str, haystack: &str) -> usize {
-    use regex::bytes::Regex;
+    use regex_old::bytes::Regex;
     Regex::new(pat).unwrap().find_iter(haystack.as_bytes()).count()
 }
 

bench/src/rust_compile.rs

@@ -1,7 +1,7 @@
-use regex_syntax::Parser;
+use regex_syntax_old::Parser;
 use test::Bencher;
 
-use regex::internal::Compiler;
+use regex_old::internal::Compiler;
 
 #[bench]
 fn compile_simple(b: &mut Bencher) {

bench/src/rust_parse.rs

@@ -1,4 +1,4 @@
-use regex_syntax::Expr;
+use regex_syntax_old::Expr;
 use test::Bencher;
 
 #[bench]

examples/shootout-regex-dna-bytes.rs

@@ -11,7 +11,7 @@ use std::thread;
 
 macro_rules! regex {
     ($re:expr) => {
-        ::regex::bytes::Regex::new($re).unwrap()
+        ::regex_old::bytes::Regex::new($re).unwrap()
     };
 }
 

examples/shootout-regex-dna-cheat.rs

@@ -16,7 +16,7 @@ use std::thread;
 
 macro_rules! regex {
     ($re:expr) => {
-        ::regex::Regex::new($re).unwrap()
+        ::regex_old::Regex::new($re).unwrap()
     };
 }
 

examples/shootout-regex-dna-replace.rs

@@ -2,7 +2,7 @@ use std::io::{self, Read};
 
 macro_rules! regex {
     ($re:expr) => {{
-        use regex::internal::ExecBuilder;
+        use regex_old::internal::ExecBuilder;
         ExecBuilder::new($re).build().unwrap().into_regex()
     }};
 }

examples/shootout-regex-dna-single-cheat.rs

@@ -9,7 +9,7 @@ use std::io::{self, Read};
 
 macro_rules! regex {
     ($re:expr) => {
-        ::regex::Regex::new($re).unwrap()
+        ::regex_old::Regex::new($re).unwrap()
     };
 }