ripgrep - Mirror of https://github.com/BurntSushi/ripgrep

diff options

pre { line-height: 125%; } td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */

name = "Luis Manarang"
github = "ProgrammaticNajel"
github-id = 17925396
email = "programmaticnajel@gmail.com"

source = "registry+https://github.com/rust-lang/crates.io-index"

dependencies = [

- "cc 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",

"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",

+ "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",

"pcre2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",

- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",

"thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",

]

@@ -482,7 +481,7 @@ name = "ripgrep"

version = "0.10.0"

dependencies = [

"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",

- "grep 0.2.2",

+ "grep 0.2.3",

"ignore 0.4.4",

"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",

"log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -736,7 +735,7 @@ dependencies = [

"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"

"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"

"checksum parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06a2b6aae052309c2fd2161ef58f5067bc17bb758377a0de9d4b279d603fdd8a"

-"checksum pcre2 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c16ec0e30c17f938a2da8ff970ad9a4100166d0538898dcc035b55c393cab54"

+"checksum pcre2 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae0a2682105ec5ca0ee5910bbc7e926386d348a05166348f74007942983c319"

"checksum pcre2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a9027f9474e4e13d3b965538aafcaebe48c803488ad76b3c97ef061a8324695f"

"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"

"checksum proc-macro2 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)" = "afa4d377067cc02eb5e0b491d3f7cfbe145ad4da778535bfb13c444413dd35b9"

diff --git a/Cargo.toml b/Cargo.toml
index a7ccd5bd..bf11a129 100644
--- a/Cargo.toml
+++ b/Cargo.toml

@@ -45,7 +45,7 @@ members = [

]

[dependencies]

-grep = { version = "0.2.2", path = "grep" }

+grep = { version = "0.2.3", path = "grep" }

ignore = { version = "0.4.4", path = "ignore" }

lazy_static = "1.1.0"

log = "0.4.5"

diff --git a/grep-pcre2/Cargo.toml b/grep-pcre2/Cargo.toml
index 1ec12302..0635a525 100644
--- a/grep-pcre2/Cargo.toml
+++ b/grep-pcre2/Cargo.toml

@@ -1,6 +1,6 @@

[package]

name = "grep-pcre2"

-version = "0.1.1" #:version

+version = "0.1.2" #:version

authors = ["Andrew Gallant <jamslam@gmail.com>"]

description = """

Use PCRE2 with the 'grep' crate.

@@ -14,4 +14,4 @@ license = "Unlicense/MIT"

[dependencies]

grep-matcher = { version = "0.1.1", path = "../grep-matcher" }

-pcre2 = "0.1.0"

+pcre2 = "0.1.1"

diff --git a/grep-pcre2/src/matcher.rs b/grep-pcre2/src/matcher.rs
index e9c51be2..105448fe 100644
--- a/grep-pcre2/src/matcher.rs
+++ b/grep-pcre2/src/matcher.rs

@@ -199,16 +199,34 @@ impl RegexMatcherBuilder {

self

}

- /// Enable PCRE2's JIT.

+ /// Enable PCRE2's JIT and return an error if it's not available.

///

/// This generally speeds up matching quite a bit. The downside is that it

/// can increase the time it takes to compile a pattern.

///

- /// This is disabled by default.

+ /// If the JIT isn't available or if JIT compilation returns an error, then

+ /// regex compilation will fail with the corresponding error.

+ ///

+ /// This is disabled by default, and always overrides `jit_if_available`.

pub fn jit(&mut self, yes: bool) -> &mut RegexMatcherBuilder {

self.builder.jit(yes);

self

}

+ /// Enable PCRE2's JIT if it's available.

+ ///

+ /// This generally speeds up matching quite a bit. The downside is that it

+ /// can increase the time it takes to compile a pattern.

+ ///

+ /// If the JIT isn't available or if JIT compilation returns an error,

+ /// then a debug message with the error will be emitted and the regex will

+ /// otherwise silently fall back to non-JIT matching.

+ ///

+ /// This is disabled by default, and always overrides `jit`.

+ pub fn jit_if_available(&mut self, yes: bool) -> &mut RegexMatcherBuilder {

+ self.builder.jit_if_available(yes);

+ self

+ }

}

/// An implementation of the `Matcher` trait using PCRE2.

diff --git a/grep/Cargo.toml b/grep/Cargo.toml
index 8faf7082..1ddcd4a2 100644
--- a/grep/Cargo.toml
+++ b/grep/Cargo.toml

@@ -1,6 +1,6 @@

[package]

name = "grep"

-version = "0.2.2" #:version

+version = "0.2.3" #:version

authors = ["Andrew Gallant <jamslam@gmail.com>"]

description = """

Fast line oriented regex searching as a library.

@@ -15,7 +15,7 @@ license = "Unlicense/MIT"

[dependencies]

grep-cli = { version = "0.1.1", path = "../grep-cli" }

grep-matcher = { version = "0.1.1", path = "../grep-matcher" }

-grep-pcre2 = { version = "0.1.1", path = "../grep-pcre2", optional = true }

+grep-pcre2 = { version = "0.1.2", path = "../grep-pcre2", optional = true }

grep-printer = { version = "0.1.1", path = "../grep-printer" }

grep-regex = { version = "0.1.1", path = "../grep-regex" }

grep-searcher = { version = "0.1.1", path = "../grep-searcher" }

diff --git a/src/args.rs b/src/args.rs
index 1a38d3ef..7aed9144 100644
--- a/src/args.rs
+++ b/src/args.rs

@@ -633,7 +633,7 @@ impl ArgMatches {

// For whatever reason, the JIT craps out during regex compilation with

// a "no more memory" error on 32 bit systems. So don't use it there.

if !cfg!(target_pointer_width = "32") {

- builder.jit(true);

+ builder.jit_if_available(true);

}

if self.pcre2_unicode() {

builder.utf(true).ucp(true);