Use empty Cache for methods requiring it when filling Cache itself

[rust.git] / src / librustdoc / doctest.rs

diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index 38969e7346826b4c371f1bb1bd7c26016bab84fd..30ff124dac60fb754e3a74d1b23047e3a924de95 100644 (file)
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -365,6 +365,9 @@ fn drop(&mut self) {
     } else {
         cmd = Command::new(output_file);
     }
+    if let Some(run_directory) = options.test_run_directory {
+        cmd.current_dir(run_directory);
+    }
 
     match cmd.output() {
         Err(e) => return Err(TestFailure::ExecutionError(e)),
@@ -423,6 +426,7 @@ fn drop(&mut self) {
             use rustc_errors::emitter::{Emitter, EmitterWriter};
             use rustc_errors::Handler;
             use rustc_parse::maybe_new_parser_from_source_str;
+            use rustc_parse::parser::ForceCollect;
             use rustc_session::parse::ParseSess;
             use rustc_span::source_map::FilePathMapping;
 
@@ -459,7 +463,7 @@ fn drop(&mut self) {
             };
 
             loop {
-                match parser.parse_item() {
+                match parser.parse_item(ForceCollect::No) {
                     Ok(Some(item)) => {
                         if !found_main {
                             if let ast::ItemKind::Fn(..) = item.kind {