Skip to content

Commit 4075d39

Browse files
BurntSushiBurntSushi
committed
progress
1 parent 159a63c commit 4075d39

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+171
-170
lines changed

Diff for: ‎Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "regex"
2+
name = "regex-old"
33
version = "1.6.0" #:version
44
authors = ["The Rust Project Developers"]
55
license = "MIT OR Apache-2.0"
@@ -32,7 +32,7 @@ doctest = false
3232
# Features are documented in the "Crate features" section of the crate docs:
3333
# https://docs.rs/regex/*/#crate-features
3434
[features]
35-
default = ["std", "perf", "unicode", "regex-syntax/default"]
35+
default = ["std", "perf", "unicode", "regex-syntax-old/default"]
3636

3737
# ECOSYSTEM FEATURES
3838

@@ -75,22 +75,22 @@ unicode = [
7575
"unicode-perl",
7676
"unicode-script",
7777
"unicode-segment",
78-
"regex-syntax/unicode",
78+
"regex-syntax-old/unicode",
7979
]
8080
# Enables use of the `Age` property, e.g., `\p{Age:3.0}`.
81-
unicode-age = ["regex-syntax/unicode-age"]
81+
unicode-age = ["regex-syntax-old/unicode-age"]
8282
# Enables use of a smattering of boolean properties, e.g., `\p{Emoji}`.
83-
unicode-bool = ["regex-syntax/unicode-bool"]
83+
unicode-bool = ["regex-syntax-old/unicode-bool"]
8484
# Enables Unicode-aware case insensitive matching, e.g., `(?i)β`.
85-
unicode-case = ["regex-syntax/unicode-case"]
85+
unicode-case = ["regex-syntax-old/unicode-case"]
8686
# Enables Unicode general categories, e.g., `\p{Letter}` or `\pL`.
87-
unicode-gencat = ["regex-syntax/unicode-gencat"]
87+
unicode-gencat = ["regex-syntax-old/unicode-gencat"]
8888
# Enables Unicode-aware Perl classes corresponding to `\w`, `\s` and `\d`.
89-
unicode-perl = ["regex-syntax/unicode-perl"]
89+
unicode-perl = ["regex-syntax-old/unicode-perl"]
9090
# Enables Unicode scripts and script extensions, e.g., `\p{Greek}`.
91-
unicode-script = ["regex-syntax/unicode-script"]
91+
unicode-script = ["regex-syntax-old/unicode-script"]
9292
# Enables Unicode segmentation properties, e.g., `\p{gcb=Extend}`.
93-
unicode-segment = ["regex-syntax/unicode-segment"]
93+
unicode-segment = ["regex-syntax-old/unicode-segment"]
9494

9595

9696
# UNSTABLE FEATURES (requires Rust nightly)
@@ -115,7 +115,7 @@ version = "2.4.0"
115115
optional = true
116116

117117
# For parsing regular expressions.
118-
[dependencies.regex-syntax]
118+
[dependencies.regex-syntax-old]
119119
path = "regex-syntax"
120120
version = "0.6.27"
121121
default-features = false

Diff for: ‎bench/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ libc = "0.2"
1919
onig = { version = "3", optional = true }
2020
libpcre-sys = { version = "0.2", optional = true }
2121
memmap = "0.6.2"
22-
regex = { version = "1", path = ".." }
23-
regex-syntax = { version = "0.6", path = "../regex-syntax" }
22+
regex-old = { version = "1", path = ".." }
23+
regex-syntax-old = { version = "0.6", path = "../regex-syntax" }
2424
serde = { version = "1", features = ["derive"] }
2525
cfg-if = "0.1"
2626

Diff for: ‎bench/src/bench.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ cfg_if! {
1414
} else if #[cfg(feature = "re-onig")] {
1515
pub use ffi::onig::Regex;
1616
} else if #[cfg(any(feature = "re-rust"))] {
17-
pub use regex::{Regex, RegexSet};
17+
pub use regex_old::{Regex, RegexSet};
1818
} else if #[cfg(feature = "re-rust-bytes")] {
19-
pub use regex::bytes::{Regex, RegexSet};
19+
pub use regex_old::bytes::{Regex, RegexSet};
2020
} else if #[cfg(feature = "re-re2")] {
2121
pub use ffi::re2::Regex;
2222
} else if #[cfg(feature = "re-pcre2")] {

Diff for: ‎bench/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ fn count_re2(pat: &str, haystack: &str) -> usize {
116116
nada!("re-rust", count_rust);
117117
#[cfg(feature = "re-rust")]
118118
fn count_rust(pat: &str, haystack: &str) -> usize {
119-
use regex::Regex;
119+
use regex_old::Regex;
120120
Regex::new(pat).unwrap().find_iter(haystack).count()
121121
}
122122

123123
nada!("re-rust-bytes", count_rust_bytes);
124124
#[cfg(feature = "re-rust-bytes")]
125125
fn count_rust_bytes(pat: &str, haystack: &str) -> usize {
126-
use regex::bytes::Regex;
126+
use regex_old::bytes::Regex;
127127
Regex::new(pat).unwrap().find_iter(haystack.as_bytes()).count()
128128
}
129129

Diff for: ‎bench/src/rust_compile.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use regex_syntax::Parser;
1+
use regex_syntax_old::Parser;
22
use test::Bencher;
33

4-
use regex::internal::Compiler;
4+
use regex_old::internal::Compiler;
55

66
#[bench]
77
fn compile_simple(b: &mut Bencher) {

Diff for: ‎bench/src/rust_parse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use regex_syntax::Expr;
1+
use regex_syntax_old::Expr;
22
use test::Bencher;
33

44
#[bench]

Diff for: ‎examples/shootout-regex-dna-bytes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::thread;
1111

1212
macro_rules! regex {
1313
($re:expr) => {
14-
::regex::bytes::Regex::new($re).unwrap()
14+
::regex_old::bytes::Regex::new($re).unwrap()
1515
};
1616
}
1717

Diff for: ‎examples/shootout-regex-dna-cheat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::thread;
1616

1717
macro_rules! regex {
1818
($re:expr) => {
19-
::regex::Regex::new($re).unwrap()
19+
::regex_old::Regex::new($re).unwrap()
2020
};
2121
}
2222

Diff for: ‎examples/shootout-regex-dna-replace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::io::{self, Read};
22

33
macro_rules! regex {
44
($re:expr) => {{
5-
use regex::internal::ExecBuilder;
5+
use regex_old::internal::ExecBuilder;
66
ExecBuilder::new($re).build().unwrap().into_regex()
77
}};
88
}

Diff for: ‎examples/shootout-regex-dna-single-cheat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::io::{self, Read};
99

1010
macro_rules! regex {
1111
($re:expr) => {
12-
::regex::Regex::new($re).unwrap()
12+
::regex_old::Regex::new($re).unwrap()
1313
};
1414
}
1515

Diff for: ‎examples/shootout-regex-dna-single.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::io::{self, Read};
99

1010
macro_rules! regex {
1111
($re:expr) => {
12-
::regex::Regex::new($re).unwrap()
12+
::regex_old::Regex::new($re).unwrap()
1313
};
1414
}
1515

Diff for: ‎examples/shootout-regex-dna.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use std::thread;
1111

1212
macro_rules! regex {
1313
($re:expr) => {
14-
::regex::Regex::new($re).unwrap()
14+
::regex_old::Regex::new($re).unwrap()
1515
};
1616
}
1717

Diff for: ‎fuzz/fuzz_targets/fuzz_regex_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fuzz_target!(|data: &[u8]| {
1414
let char_index = data.char_indices().nth(split_off_point);
1515
if let Some((char_index, _)) = char_index {
1616
let (pattern, input) = data.split_at(char_index);
17-
if let Ok(re) = regex::Regex::new(pattern) {
17+
if let Ok(re) = regex_old::Regex::new(pattern) {
1818
re.is_match(input);
1919
}
2020
}

Diff for: ‎regex-capi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ crate-type = ["staticlib", "cdylib"]
1919

2020
[dependencies]
2121
libc = "0.2"
22-
regex = { version = "1", path = ".." }
22+
regex-old = { version = "1", path = ".." }

Diff for: ‎regex-capi/src/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub struct Error {
1616
pub enum ErrorKind {
1717
None,
1818
Str(str::Utf8Error),
19-
Regex(regex::Error),
19+
Regex(regex_old::Error),
2020
Nul(ffi::NulError),
2121
}
2222

Diff for: ‎regex-capi/src/rure.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::slice;
66
use std::str;
77

88
use libc::{c_char, size_t};
9-
use regex::bytes;
9+
use regex_old::bytes;
1010

1111
use crate::error::{Error, ErrorKind};
1212

@@ -609,7 +609,7 @@ fn rure_escape(
609609
return ptr::null();
610610
},
611611
};
612-
let esc_pat = regex::escape(str_pat);
612+
let esc_pat = regex_old::escape(str_pat);
613613
let c_esc_pat = match CString::new(esc_pat) {
614614
Ok(val) => val,
615615
Err(err) => unsafe {

Diff for: ‎regex-debug/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ edition = "2018"
1313

1414
[dependencies]
1515
docopt = "1"
16-
regex = { version = "1.1", path = ".." }
17-
regex-syntax = { version = "0.6", path = "../regex-syntax" }
16+
regex-old = { version = "1.1", path = ".." }
17+
regex-syntax-old = { version = "0.6", path = "../regex-syntax" }
1818
serde = { version = "1", features = ["derive"] }

Diff for: ‎regex-debug/src/main.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use std::process;
44
use std::result;
55

66
use docopt::Docopt;
7-
use regex::internal::{Compiler, LiteralSearcher};
8-
use regex_syntax::hir::literal::Literals;
9-
use regex_syntax::hir::Hir;
7+
use regex_old::internal::{Compiler, LiteralSearcher};
8+
use regex_syntax_old::hir::literal::Literals;
9+
use regex_syntax_old::hir::Hir;
1010

1111
const USAGE: &'static str = "
1212
Usage:
@@ -120,7 +120,7 @@ fn run(args: &Args) -> Result<()> {
120120
}
121121

122122
fn cmd_ast(args: &Args) -> Result<()> {
123-
use regex_syntax::ast::parse::Parser;
123+
use regex_syntax_old::ast::parse::Parser;
124124

125125
let mut parser = Parser::new();
126126
let ast = parser.parse(&args.arg_pattern)?;
@@ -129,7 +129,7 @@ fn cmd_ast(args: &Args) -> Result<()> {
129129
}
130130

131131
fn cmd_hir(args: &Args) -> Result<()> {
132-
use regex_syntax::ParserBuilder;
132+
use regex_syntax_old::ParserBuilder;
133133

134134
let mut parser = ParserBuilder::new().allow_invalid_utf8(false).build();
135135
let hir = parser.parse(&args.arg_pattern)?;
@@ -218,9 +218,9 @@ fn cmd_compile(args: &Args) -> Result<()> {
218218
}
219219

220220
fn cmd_utf8_ranges(args: &Args) -> Result<()> {
221-
use regex_syntax::hir::{self, HirKind};
222-
use regex_syntax::utf8::Utf8Sequences;
223-
use regex_syntax::ParserBuilder;
221+
use regex_syntax_old::hir::{self, HirKind};
222+
use regex_syntax_old::utf8::Utf8Sequences;
223+
use regex_syntax_old::ParserBuilder;
224224

225225
let hir = ParserBuilder::new()
226226
.build()
@@ -251,9 +251,9 @@ fn cmd_utf8_ranges(args: &Args) -> Result<()> {
251251
}
252252

253253
fn cmd_utf8_ranges_rev(args: &Args) -> Result<()> {
254-
use regex_syntax::hir::{self, HirKind};
255-
use regex_syntax::utf8::Utf8Sequences;
256-
use regex_syntax::ParserBuilder;
254+
use regex_syntax_old::hir::{self, HirKind};
255+
use regex_syntax_old::utf8::Utf8Sequences;
256+
use regex_syntax_old::ParserBuilder;
257257

258258
let hir = ParserBuilder::new()
259259
.build()
@@ -327,7 +327,7 @@ impl Args {
327327
}
328328

329329
fn parse(re: &str) -> Result<Hir> {
330-
use regex_syntax::ParserBuilder;
330+
use regex_syntax_old::ParserBuilder;
331331
ParserBuilder::new()
332332
.allow_invalid_utf8(true)
333333
.build()

Diff for: ‎regex-syntax/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "regex-syntax"
2+
name = "regex-syntax-old"
33
version = "0.6.27" #:version
44
authors = ["The Rust Project Developers"]
55
license = "MIT OR Apache-2.0"

Diff for: ‎regex-syntax/benches/bench.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
extern crate test;
44

5-
use regex_syntax::Parser;
5+
use regex_syntax_old::Parser;
66
use test::Bencher;
77

88
#[bench]

Diff for: ‎regex-syntax/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ convert your pattern to an `Ast` and then convert the `Ast` to an `Hir`.
3737
This example shows how to parse a pattern string into its HIR:
3838
3939
```
40-
use regex_syntax::Parser;
41-
use regex_syntax::hir::{self, Hir};
40+
use regex_syntax_old::Parser;
41+
use regex_syntax_old::hir::{self, Hir};
4242
4343
let hir = Parser::new().parse("a|b").unwrap();
4444
assert_eq!(hir, Hir::alternation(vec![

Diff for: ‎regex-syntax/src/utf8.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ impl fmt::Debug for Utf8Range {
264264
/// scalar values.
265265
///
266266
/// ```rust
267-
/// use regex_syntax::utf8::{Utf8Sequences, Utf8Sequence};
267+
/// use regex_syntax_old::utf8::{Utf8Sequences, Utf8Sequence};
268268
///
269269
/// fn matches(seqs: &[Utf8Sequence], bytes: &[u8]) -> bool {
270270
/// for range in seqs {

Diff for: ‎src/compile.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use std::iter;
44
use std::result;
55
use std::sync::Arc;
66

7-
use regex_syntax::hir::{self, Hir};
8-
use regex_syntax::is_word_byte;
9-
use regex_syntax::utf8::{Utf8Range, Utf8Sequence, Utf8Sequences};
7+
use regex_syntax_old::hir::{self, Hir};
8+
use regex_syntax_old::is_word_byte;
9+
use regex_syntax_old::utf8::{Utf8Range, Utf8Sequence, Utf8Sequences};
1010

1111
use crate::prog::{
1212
EmptyLook, Inst, InstBytes, InstChar, InstEmptyLook, InstPtr, InstRanges,
@@ -267,7 +267,7 @@ impl Compiler {
267267
/// instruction, and so no patch.entry value makes sense.
268268
fn c(&mut self, expr: &Hir) -> ResultOrEmpty {
269269
use crate::prog;
270-
use regex_syntax::hir::HirKind::*;
270+
use regex_syntax_old::hir::HirKind::*;
271271

272272
self.check_size()?;
273273
match *expr.kind() {
@@ -587,7 +587,7 @@ impl Compiler {
587587
}
588588

589589
fn c_repeat(&mut self, rep: &hir::Repetition) -> ResultOrEmpty {
590-
use regex_syntax::hir::RepetitionKind::*;
590+
use regex_syntax_old::hir::RepetitionKind::*;
591591
match rep.kind {
592592
ZeroOrOne => self.c_repeat_zero_or_one(&rep.hir, rep.greedy),
593593
ZeroOrMore => self.c_repeat_zero_or_more(&rep.hir, rep.greedy),

Diff for: ‎src/exec.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use std::sync::Arc;
55

66
#[cfg(feature = "perf-literal")]
77
use aho_corasick::{AhoCorasick, AhoCorasickBuilder, MatchKind};
8-
use regex_syntax::hir::literal::Literals;
9-
use regex_syntax::hir::Hir;
10-
use regex_syntax::ParserBuilder;
8+
use regex_syntax_old::hir::literal::Literals;
9+
use regex_syntax_old::hir::Hir;
10+
use regex_syntax_old::ParserBuilder;
1111

1212
use crate::backtrack;
1313
use crate::compile::Compiler;
@@ -1547,7 +1547,7 @@ impl ProgramCacheInner {
15471547
/// literals, and if so, returns them. Otherwise, this returns None.
15481548
#[cfg(feature = "perf-literal")]
15491549
fn alternation_literals(expr: &Hir) -> Option<Vec<Vec<u8>>> {
1550-
use regex_syntax::hir::{HirKind, Literal};
1550+
use regex_syntax_old::hir::{HirKind, Literal};
15511551

15521552
// This is pretty hacky, but basically, if `is_alternation_literal` is
15531553
// true, then we can make several assumptions about the structure of our

Diff for: ‎src/input.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -377,15 +377,18 @@ impl Char {
377377
// available. However, our compiler ensures that if a Unicode word
378378
// boundary is used, then the data must also be available. If it isn't,
379379
// then the compiler returns an error.
380-
char::from_u32(self.0).map_or(false, regex_syntax::is_word_character)
380+
char::from_u32(self.0)
381+
.map_or(false, regex_syntax_old::is_word_character)
381382
}
382383

383384
/// Returns true iff the byte is a word byte.
384385
///
385386
/// If the byte is absent, then false is returned.
386387
pub fn is_word_byte(self) -> bool {
387388
match char::from_u32(self.0) {
388-
Some(c) if c <= '\u{7F}' => regex_syntax::is_word_byte(c as u8),
389+
Some(c) if c <= '\u{7F}' => {
390+
regex_syntax_old::is_word_byte(c as u8)
391+
}
389392
None | Some(_) => false,
390393
}
391394
}

0 commit comments

Comments
 (0)