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

Author: aswild

GUIDE.md

@@ -992,6 +992,8 @@ used options that will likely impact how you use ripgrep on a regular basis.
 * `-S/--smart-case`: This is similar to `--ignore-case`, but disables itself
   if the pattern contains any uppercase letters. Usually this flag is put into
   alias or a config file.
+* `-F/--fixed-strings`: Disable regular expression matching and treat the pattern
+   as a literal string. 
 * `-w/--word-regexp`: Require that all matches of the pattern be surrounded
   by word boundaries. That is, given `pattern`, the `--word-regexp` flag will
   cause ripgrep to behave as if `pattern` were actually `\b(?:pattern)\b`.

crates/core/app.rs

@@ -1246,7 +1246,7 @@ fn flag_field_context_separator(args: &mut Vec<RGArg>) {
 Set the field context separator, which is used to delimit file paths, line
 numbers, columns and the context itself, when printing contextual lines. The
 separator may be any number of bytes, including zero. Escape sequences like
-\\x7F or \\t may be used. The default value is -.
+\\x7F or \\t may be used. The '-' character is the default value.
 "
     );
     let arg = RGArg::flag("field-context-separator", "SEPARATOR")
@@ -1261,8 +1261,8 @@ fn flag_field_match_separator(args: &mut Vec<RGArg>) {
         "\
 Set the field match separator, which is used to delimit file paths, line
 numbers, columns and the match itself. The separator may be any number of
-bytes, including zero. Escape sequences like \\x7F or \\t may be used. The
-default value is -.
+bytes, including zero. Escape sequences like \\x7F or \\t may be used. The ':'
+character is the default value.
 "
     );
     let arg = RGArg::flag("field-match-separator", "SEPARATOR")
@@ -1567,7 +1567,7 @@ When specifying multiple ignore files, earlier files have lower precedence
 than later files.
 
 If you are looking for a way to include or exclude files and directories
-directly on the command line, then used -g instead.
+directly on the command line, then use -g instead.
 "
     );
     let arg = RGArg::flag("ignore-file", "PATH")

crates/ignore/src/default_types.rs

@@ -46,6 +46,7 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("cshtml", &["*.cshtml"]),
     ("css", &["*.css", "*.scss"]),
     ("csv", &["*.csv"]),
+    ("cuda", &["*.cu", "*.cuh"]),
     ("cython", &["*.pyx", "*.pxi", "*.pxd"]),
     ("d", &["*.d"]),
     ("dart", &["*.dart"]),
@@ -225,6 +226,7 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("taskpaper", &["*.taskpaper"]),
     ("tcl", &["*.tcl"]),
     ("tex", &["*.tex", "*.ltx", "*.cls", "*.sty", "*.bib", "*.dtx", "*.ins"]),
+    ("texinfo", &["*.texi"]),
     ("textile", &["*.textile"]),
     ("tf", &["*.tf"]),
     ("thrift", &["*.thrift"]),