diff options
| author | Jonathan Turner <jturner@mozilla.com> | 2016-07-05 15:24:23 -0400 |
|---|---|---|
| committer | Jonathan Turner <jturner@mozilla.com> | 2016-07-14 07:57:46 -0400 |
| commit | 8f044fae36b73ec4593c127ec2a7c28716208591 (patch) | |
| tree | 926f262cc1c7f8e64d2f9fe858480ea21c7f28b7 /src/libsyntax | |
| parent | 3c85f414e922b7bf427493211601c0c7bde3a286 (diff) | |
| download | rust-8f044fae36b73ec4593c127ec2a7c28716208591.tar.gz rust-8f044fae36b73ec4593c127ec2a7c28716208591.zip | |
Remove BasicEmitter
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/codemap.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 743f96d737e..3b93dc0c4d3 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -1235,7 +1235,7 @@ r"blork2.rs:2:1: 2:12 let cm = Rc::new(CodeMap::new()); let mut ew = EmitterWriter::new(Box::new(Sink(data.clone())), None, - cm.clone(), + Some(cm.clone()), FormatMode::NewErrorFormat); let content = "abcdefg koksi @@ -1321,7 +1321,7 @@ r"blork2.rs:2:1: 2:12 let cm = Rc::new(CodeMap::new()); let mut diag = EmitterWriter::new(Box::new(Sink(data.clone())), None, - cm.clone(), + Some(cm.clone()), FormatMode::NewErrorFormat); let inp = "_____aaaaaa____bbbbbb__cccccdd_"; @@ -1377,7 +1377,7 @@ r"blork2.rs:2:1: 2:12 let cm = Rc::new(CodeMap::new()); let mut diag = EmitterWriter::new(Box::new(Sink(data.clone())), None, - cm.clone(), + Some(cm.clone()), FormatMode::NewErrorFormat); let inp = "aaaaa\n\ diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 77b5c10899a..5ea1d6be9fe 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1686,7 +1686,7 @@ mod tests { // FIXME (#22405): Replace `Box::new` with `box` here when/if possible. let emitter = errors::emitter::EmitterWriter::new(Box::new(io::sink()), None, - cm, + Some(cm), errors::snippet::FormatMode::EnvironmentSelected); errors::Handler::with_emitter(true, false, Box::new(emitter)) } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 9502bc48a3e..6af4d95e888 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -50,7 +50,11 @@ pub struct ParseSess { impl ParseSess { pub fn new() -> ParseSess { let cm = Rc::new(CodeMap::new()); - let handler = Handler::with_tty_emitter(ColorConfig::Auto, None, true, false, cm.clone()); + let handler = Handler::with_tty_emitter(ColorConfig::Auto, + None, + true, + false, + Some(cm.clone())); ParseSess::with_span_handler(handler, cm) } |