about summary refs log tree commit diff
path: root/src/librustdoc
diff options
context:
space:
mode:
authorJonathan Turner <jturner@mozilla.com>2016-07-05 15:24:23 -0400
committerJonathan Turner <jturner@mozilla.com>2016-07-14 07:57:46 -0400
commit8f044fae36b73ec4593c127ec2a7c28716208591 (patch)
tree926f262cc1c7f8e64d2f9fe858480ea21c7f28b7 /src/librustdoc
parent3c85f414e922b7bf427493211601c0c7bde3a286 (diff)
downloadrust-8f044fae36b73ec4593c127ec2a7c28716208591.tar.gz
rust-8f044fae36b73ec4593c127ec2a7c28716208591.zip
Remove BasicEmitter
Diffstat (limited to 'src/librustdoc')
-rw-r--r--src/librustdoc/core.rs2
-rw-r--r--src/librustdoc/test.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 49a3991ecbe..fc9ae73f5ce 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -131,7 +131,7 @@ pub fn run_core(search_paths: SearchPaths,
                                                                None,
                                                                true,
                                                                false,
-                                                               codemap.clone());
+                                                               Some(codemap.clone()));
 
     let dep_graph = DepGraph::new(false);
     let _ignore = dep_graph.in_ignore();
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index bb69ba6e568..f9d0df9981a 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -77,7 +77,7 @@ pub fn run(input: &str,
                                                                None,
                                                                true,
                                                                false,
-                                                               codemap.clone());
+                                                               Some(codemap.clone()));
 
     let dep_graph = DepGraph::new(false);
     let _ignore = dep_graph.in_ignore();
@@ -229,7 +229,7 @@ fn runtest(test: &str, cratename: &str, cfgs: Vec<String>, libs: SearchPaths,
     let codemap = Rc::new(CodeMap::new());
     let emitter = errors::emitter::EmitterWriter::new(box Sink(data.clone()),
                                                 None,
-                                                codemap.clone(),
+                                                Some(codemap.clone()),
                                                 errors::snippet::FormatMode::EnvironmentSelected);
     let old = io::set_panic(box Sink(data.clone()));
     let _bomb = Bomb(data.clone(), old.unwrap_or(box io::stdout()));