diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:20:35 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:20:35 -0800 |
| commit | 87c3ee861ec488827044e07d5d0cd7c8508c681f (patch) | |
| tree | 49a374a1baf3e3b816120ffdbf28959e10a5ea34 /src/libsyntax/parse/lexer | |
| parent | e4b81d25122b0ff230182375d09300d5403b1750 (diff) | |
| parent | 3cb9fa26ef9905c00a29ea577fb55a12a91c8e7b (diff) | |
| download | rust-87c3ee861ec488827044e07d5d0cd7c8508c681f.tar.gz rust-87c3ee861ec488827044e07d5d0cd7c8508c681f.zip | |
rollup merge of #21457: alexcrichton/issue-21436
Conflicts: src/liballoc/boxed.rs src/librustc/middle/traits/error_reporting.rs src/libstd/sync/mpsc/mod.rs
Diffstat (limited to 'src/libsyntax/parse/lexer')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index d18bf554975..753e3a68d2e 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -586,10 +586,10 @@ impl<'a> StringReader<'a> { /// `\x00` marker. #[inline(never)] fn scan_embedded_hygienic_ident(&mut self) -> ast::Ident { - fn bump_expecting_char<'a,D:fmt::Show>(r: &mut StringReader<'a>, - c: char, - described_c: D, - whence: &str) { + fn bump_expecting_char<'a,D:fmt::Debug>(r: &mut StringReader<'a>, + c: char, + described_c: D, + whence: &str) { match r.curr { Some(r_c) if r_c == c => r.bump(), Some(r_c) => panic!("expected {:?}, hit {:?}, {}", described_c, r_c, whence), |