From fad4f32c3147cca9f2b107d0440065b9e3d6c10f Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jturner@mozilla.com>
Date: Fri, 5 Aug 2016 15:58:31 -0700
Subject: Turn on new errors, json mode. Remove duplicate unicode test

---
 src/libsyntax/parse/mod.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 7b28952aff6..cd1fdcfe9d1 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -51,7 +51,6 @@ impl ParseSess {
     pub fn new() -> ParseSess {
         let cm = Rc::new(CodeMap::new());
         let handler = Handler::with_tty_emitter(ColorConfig::Auto,
-                                                None,
                                                 true,
                                                 false,
                                                 Some(cm.clone()));
-- 
cgit 1.4.1-3-g733a5


From c350ec7bb38805bfcd633dc26822c04c6c1419a9 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jturner@mozilla.com>
Date: Sun, 7 Aug 2016 07:50:27 -0700
Subject: Fix old call in lexer tests

---
 src/libsyntax/parse/lexer/mod.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/libsyntax/parse')

diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index 5ea1d6be9fe..9e9ea096460 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -1685,9 +1685,7 @@ mod tests {
     fn mk_sh(cm: Rc<CodeMap>) -> errors::Handler {
         // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
         let emitter = errors::emitter::EmitterWriter::new(Box::new(io::sink()),
-                                                None,
-                                                Some(cm),
-                                                errors::snippet::FormatMode::EnvironmentSelected);
+                                                Some(cm));
         errors::Handler::with_emitter(true, false, Box::new(emitter))
     }
 
-- 
cgit 1.4.1-3-g733a5