rust/ripgrep
1
0
Fork 0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-04-14 00:58:43 +02:00
Code Issues Releases Activity

Improve the "bad literal" error message.

Browse Source 
Incidentally, this was done by using the Debug impl for `char` instead
of the Display impl. Cute.

Fixes #5.
This commit is contained in:
Andrew Gallant 2016-09-16 18:12:00 -04:00
parent e9ec52b7f9
commit d22a3ca3e5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grep/src/lib.rs
View File

@ -62,7 +62,7 @@ impl fmt::Display for Error {
match *self { match *self {
Error::Regex(ref err) => err.fmt(f), Error::Regex(ref err) => err.fmt(f),
Error::LiteralNotAllowed(chr) => { Error::LiteralNotAllowed(chr) => {
write!(f, "Literal '{}' not allowed.", chr) write!(f, "Literal {:?} not allowed.", chr)
} }
Error::__Nonexhaustive => unreachable!(), Error::__Nonexhaustive => unreachable!(),
} }

4
grep/src/nonl.rs
View File

@ -10,6 +10,10 @@ use {Error, Result};
/// If `byte` is not an ASCII character (i.e., greater than `0x7F`), then this /// If `byte` is not an ASCII character (i.e., greater than `0x7F`), then this
/// function panics. /// function panics.
pub fn remove(expr: Expr, byte: u8) -> Result<Expr> { pub fn remove(expr: Expr, byte: u8) -> Result<Expr> {
// TODO(burntsushi): There is a bug in this routine where only `\n` is
// handled correctly. Namely, `AnyChar` and `AnyByte` need to be translated
// to proper character classes instead of the special `AnyCharNoNL` and
// `AnyByteNoNL` classes.
use syntax::Expr::*; use syntax::Expr::*;
assert!(byte <= 0x7F); assert!(byte <= 0x7F);
let chr = byte as char; let chr = byte as char;