Merge branch 'master' of https://github.com/burntsushi/ripgrep

aswild · aswild · commit bd78899eebe6 · 2021-06-29T10:46:15.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,23 @@
-TBD
-===
+13.0.1
+======
+Unreleased changes. Release notes have not yet been written.
+
+Bug fixes:
+
+* [BUG #1891](https://github.com/BurntSushi/ripgrep/issues/1891):
+  Fix bug when using `-w` with a regex that can match the empty string.
+* [BUG #1911](https://github.com/BurntSushi/ripgrep/issues/1911):
+  Disable mmap searching in all non-64-bit environments.
+
+
+13.0.0 (2021-06-12)
+===================
 ripgrep 13 is a new major version release of ripgrep that primarily contains
-bug fixes. There is also a fix for a security vulnerability on Windows
-([CVE-2021-3013](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3013)),
-some performance improvements and some minor breaking changes.
+bug fixes, some performance improvements and a few minor breaking changes.
+There is also a fix for a security vulnerability on Windows
+([CVE-2021-3013](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3013)).
+
+Some highlights:
 
 A new short flag, `-.`, has been added. It is an alias for the `--hidden` flag,
 which instructs ripgrep to search hidden files and directories.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ripgrep"
-version = "12.1.1"  #:version
+version = "13.0.0"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 ripgrep is a line-oriented search tool that recursively searches the current
@@ -42,8 +42,8 @@ members = [
 
 [dependencies]
 bstr = "0.2.12"
-grep = { version = "0.2.7", path = "crates/grep" }
-ignore = { version = "0.4.16", path = "crates/ignore" }
+grep = { version = "0.2.8", path = "crates/grep" }
+ignore = { version = "0.4.18", path = "crates/ignore" }
 lazy_static = "1.1.0"
 log = "0.4.5"
 num_cpus = "1.8.0"
diff --git a/GUIDE.md b/GUIDE.md
@@ -178,11 +178,11 @@ search. By default, when you search a directory, ripgrep will ignore all of
 the following:
 
 1. Files and directories that match glob patterns in these three categories:
-  1. gitignore globs (including global and repo-specific globs).
-  2. `.ignore` globs, which take precedence over all gitignore globs when
-     there's a conflict.
-  3. `.rgignore` globs, which take precedence over all `.ignore` globs when
-     there's a conflict.
+      1. gitignore globs (including global and repo-specific globs).
+      2. `.ignore` globs, which take precedence over all gitignore globs
+         when there's a conflict.
+      3. `.rgignore` globs, which take precedence over all `.ignore` globs
+         when there's a conflict.
 2. Hidden files and directories.
 3. Binary files. (ripgrep considers any file with a `NUL` byte to be binary.)
 4. Symbolic links aren't followed.
diff --git a/RELEASE-CHECKLIST.md b/RELEASE-CHECKLIST.md
@@ -1,9 +1,11 @@
 Release Checklist
 -----------------
+* Ensure local `master` is up to date with respect to `origin/master`.
 * Run `cargo update` and review dependency updates. Commit updated
   `Cargo.lock`.
 * Run `cargo outdated` and review semver incompatible updates. Unless there is
-  a strong motivation otherwise, review and update every dependency.
+  a strong motivation otherwise, review and update every dependency. Also
+  run `--aggressive`, but don't update to crates that are still in beta.
 * Review changes for every crate in `crates` since the last ripgrep release.
   If the set of changes is non-empty, issue a new release for that crate. Check
   crates in the following order. After updating a crate, ensure minimal
@@ -24,6 +26,11 @@ Release Checklist
   `cargo update -p ripgrep` so that the `Cargo.lock` is updated. Commit the
   changes and create a new signed tag. Alternatively, use
   `cargo-up --no-push --no-release Cargo.toml {VERSION}` to automate this.
+* Push changes to GitHub, NOT including the tag. (But do not publish new
+  version of ripgrep to crates.io yet.)
+* Once CI for `master` finishes successfully, push the version tag. (Trying to
+  do this in one step seems to result in GitHub Actions not seeing the tag
+  push and thus not running the release workflow.)
 * Wait for CI to finish creating the release. If the release build fails, then
   delete the tag from GitHub, make fixes, re-tag, delete the release and push.
 * Copy the relevant section of the CHANGELOG to the tagged release notes.
diff --git a/ci/build-deb b/ci/build-deb
@@ -39,4 +39,4 @@ cp complete/_rg "$DEPLOY_DIR/"
 
 # Since we're distributing the dpkg, we don't know whether the user will have
 # PCRE2 installed, so just do a static build.
-PCRE2_SYS_STATIC=1 cargo deb
+PCRE2_SYS_STATIC=1 cargo deb --target x86_64-unknown-linux-musl
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep-cli"
-version = "0.1.5"  #:version
+version = "0.1.6"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Utilities for search oriented command line applications.
@@ -16,7 +16,7 @@ edition = "2018"
 [dependencies]
 atty = "0.2.11"
 bstr = "0.2.0"
-globset = { version = "0.4.5", path = "../globset" }
+globset = { version = "0.4.7", path = "../globset" }
 lazy_static = "1.1.0"
 log = "0.4.5"
 regex = "1.1"
diff --git a/crates/core/app.rs b/crates/core/app.rs
@@ -1414,7 +1414,7 @@ it. If multiple globs match a file or directory, the glob given later in the
 command line takes precedence.
 
 As an extension, globs support specifying alternatives: *-g ab{c,d}* is
-equivalet to *-g abc -g abd*. Empty alternatives like *-g ab{,c}* are not
+equivalent to *-g abc -g abd*. Empty alternatives like *-g ab{,c}* are not
 currently supported. Note that this syntax extension is also currently enabled
 in gitignore files, even though this syntax isn't supported by git itself.
 ripgrep may disable this syntax extension in gitignore files, but it will
diff --git a/crates/globset/Cargo.toml b/crates/globset/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "globset"
-version = "0.4.6"  #:version
+version = "0.4.8"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Cross platform single glob and glob set matching. Glob set matching is the
diff --git a/crates/globset/src/serde_impl.rs b/crates/globset/src/serde_impl.rs
@@ -1,7 +1,7 @@
 use serde::de::Error;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use Glob;
+use crate::Glob;
 
 impl Serialize for Glob {
     fn serialize<S: Serializer>(
diff --git a/crates/grep/Cargo.toml b/crates/grep/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep"
-version = "0.2.7"  #:version
+version = "0.2.8"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Fast line oriented regex searching as a library.
@@ -14,12 +14,12 @@ license = "Unlicense/MIT"
 edition = "2018"
 
 [dependencies]
-grep-cli = { version = "0.1.5", path = "../cli" }
-grep-matcher = { version = "0.1.4", path = "../matcher" }
-grep-pcre2 = { version = "0.1.4", path = "../pcre2", optional = true }
-grep-printer = { version = "0.1.5", path = "../printer" }
-grep-regex = { version = "0.1.8", path = "../regex" }
-grep-searcher = { version = "0.1.7", path = "../searcher" }
+grep-cli = { version = "0.1.6", path = "../cli" }
+grep-matcher = { version = "0.1.5", path = "../matcher" }
+grep-pcre2 = { version = "0.1.5", path = "../pcre2", optional = true }
+grep-printer = { version = "0.1.6", path = "../printer" }
+grep-regex = { version = "0.1.9", path = "../regex" }
+grep-searcher = { version = "0.1.8", path = "../searcher" }
 
 [dev-dependencies]
 termcolor = "1.0.4"
diff --git a/crates/ignore/Cargo.toml b/crates/ignore/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ignore"
-version = "0.4.17"  #:version
+version = "0.4.18"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 A fast library for efficiently matching ignore files such as `.gitignore`
@@ -20,7 +20,7 @@ bench = false
 
 [dependencies]
 crossbeam-utils = "0.8.0"
-globset = { version = "0.4.5", path = "../globset" }
+globset = { version = "0.4.7", path = "../globset" }
 lazy_static = "1.1"
 log = "0.4.5"
 memchr = "2.1"
diff --git a/crates/ignore/src/default_types.rs b/crates/ignore/src/default_types.rs
@@ -40,7 +40,7 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
         "*.[ChH].in", "*.cc.in", "*.[ch]pp.in", "*.[ch]xx.in", "*.hh.in",
     ]),
     ("creole", &["*.creole"]),
-    ("crystal", &["Projectfile", "*.cr"]),
+    ("crystal", &["Projectfile", "*.cr", "*.ecr", "shard.yml"]),
     ("cs", &["*.cs"]),
     ("csharp", &["*.cs"]),
     ("cshtml", &["*.cshtml"]),
diff --git a/crates/matcher/Cargo.toml b/crates/matcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep-matcher"
-version = "0.1.4"  #:version
+version = "0.1.5"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 A trait for regular expressions, with a focus on line oriented search.
diff --git a/crates/matcher/src/lib.rs b/crates/matcher/src/lib.rs
@@ -116,7 +116,7 @@ impl Match {
     /// This method panics if `start > self.end`.
     #[inline]
     pub fn with_start(&self, start: usize) -> Match {
-        assert!(start <= self.end);
+        assert!(start <= self.end, "{} is not <= {}", start, self.end);
         Match { start, ..*self }
     }
 
@@ -128,7 +128,7 @@ impl Match {
     /// This method panics if `self.start > end`.
     #[inline]
     pub fn with_end(&self, end: usize) -> Match {
-        assert!(self.start <= end);
+        assert!(self.start <= end, "{} is not <= {}", self.start, end);
         Match { end, ..*self }
     }
 
diff --git a/crates/pcre2/Cargo.toml b/crates/pcre2/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep-pcre2"
-version = "0.1.4"  #:version
+version = "0.1.5"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Use PCRE2 with the 'grep' crate.
@@ -14,5 +14,5 @@ license = "Unlicense/MIT"
 edition = "2018"
 
 [dependencies]
-grep-matcher = { version = "0.1.2", path = "../matcher" }
-pcre2 = "0.2.0"
+grep-matcher = { version = "0.1.5", path = "../matcher" }
+pcre2 = "0.2.3"
diff --git a/crates/printer/Cargo.toml b/crates/printer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep-printer"
-version = "0.1.5"  #:version
+version = "0.1.6"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 An implementation of the grep crate's Sink trait that provides standard
@@ -21,11 +21,11 @@ serde1 = ["base64", "serde", "serde_json"]
 [dependencies]
 base64 = { version = "0.13.0", optional = true }
 bstr = "0.2.0"
-grep-matcher = { version = "0.1.2", path = "../matcher" }
-grep-searcher = { version = "0.1.4", path = "../searcher" }
+grep-matcher = { version = "0.1.5", path = "../matcher" }
+grep-searcher = { version = "0.1.8", path = "../searcher" }
 termcolor = "1.0.4"
 serde = { version = "1.0.77", optional = true, features = ["derive"] }
 serde_json = { version = "1.0.27", optional = true }
 
 [dev-dependencies]
-grep-regex = { version = "0.1.3", path = "../regex" }
+grep-regex = { version = "0.1.9", path = "../regex" }
diff --git a/crates/regex/Cargo.toml b/crates/regex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grep-regex"
-version = "0.1.8"  #:version
+version = "0.1.9"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Use Rust's regex library with the 'grep' crate.
@@ -16,7 +16,7 @@ edition = "2018"
 [dependencies]
 aho-corasick = "0.7.3"
 bstr = "0.2.10"
-grep-matcher = { version = "0.1.2", path = "../matcher" }
+grep-matcher = { version = "0.1.5", path = "../matcher" }
 log = "0.4.5"
 regex = "1.1"
 regex-syntax = "0.6.5"
diff --git a/crates/regex/src/word.rs b/crates/regex/src/word.rs
diff --git a/crates/searcher/Cargo.toml b/crates/searcher/Cargo.toml
diff --git a/crates/searcher/src/searcher/mmap.rs b/crates/searcher/src/searcher/mmap.rs
diff --git a/pkg/brew/ripgrep-bin.rb b/pkg/brew/ripgrep-bin.rb
diff --git a/tests/regression.rs b/tests/regression.rs
