diff options
| author | bors <bors@rust-lang.org> | 2019-04-17 10:03:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-17 10:03:02 +0000 |
| commit | efe2f32a6b8217425f361ec7c206910c611c03ee (patch) | |
| tree | 8976b59372367993066cd5d3bdd70f8b50e7aa81 /src/libsyntax/parse | |
| parent | e4e032a0ae82d7db4f99872ff98626af2941c4a5 (diff) | |
| parent | eb958e1b2e498f4751ac7c36cb2aeb4ce2ab68a0 (diff) | |
| download | rust-efe2f32a6b8217425f361ec7c206910c611c03ee.tar.gz rust-efe2f32a6b8217425f361ec7c206910c611c03ee.zip | |
Auto merge of #60030 - Centril:rollup-3d0t24t, r=Centril
Rollup of 5 pull requests Successful merges: - #59128 (Emit ansi color codes in the `rendered` field of json diagnostics) - #59646 (const fn: Improve wording) - #59986 (Miri: refactor new allocation tagging) - #60003 (LLD is not supported on Darwin) - #60018 (Miri now supports entropy, but is still slow) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 5557e281a66..3b980fafc2f 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1920,6 +1920,7 @@ mod tests { let emitter = errors::emitter::EmitterWriter::new(Box::new(io::sink()), Some(sm.clone()), false, + false, false); ParseSess { span_diagnostic: errors::Handler::with_emitter(true, None, Box::new(emitter)), |