about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-08-21 11:52:20 +0200
committerGitHub <noreply@github.com>2019-08-21 11:52:20 +0200
commitd7c162aefd8bcb28a00be5dff019bf345e4ccbbe (patch)
tree653946e99c5091be7adc163bae3d0a794a416a1b /src/bootstrap
parentbea0372a1a7a31b81f28cc4d9a83a2dc9a79d008 (diff)
parent72e2cfd93438ef0109cbaca9f961efa5ac6d4f84 (diff)
downloadrust-d7c162aefd8bcb28a00be5dff019bf345e4ccbbe.tar.gz
rust-d7c162aefd8bcb28a00be5dff019bf345e4ccbbe.zip
Rollup merge of #63721 - Mark-Simulacrum:decouple-error-index, r=matthewjasper
Do not emit JSON dumps of diagnostic codes

This decouples the error index generator from libsyntax for the most part (though it still depends on librustdoc for the markdown parsing and generation).

Fixes #34588
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/doc.rs3
-rw-r--r--src/bootstrap/test.rs3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 36229720e42..4f96c12fc1d 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -825,8 +825,7 @@ impl Step for ErrorIndex {
         index.arg(crate::channel::CFG_RELEASE_NUM);
 
         // FIXME: shouldn't have to pass this env var
-        index.env("CFG_BUILD", &builder.config.build)
-             .env("RUSTC_ERROR_METADATA_DST", builder.extended_error_dir());
+        index.env("CFG_BUILD", &builder.config.build);
 
         builder.run(&mut index);
     }
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c2c134bfd1d..87bd5cbacff 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -1535,8 +1535,7 @@ impl Step for ErrorIndex {
         );
         tool.arg("markdown")
             .arg(&output)
-            .env("CFG_BUILD", &builder.config.build)
-            .env("RUSTC_ERROR_METADATA_DST", builder.extended_error_dir());
+            .env("CFG_BUILD", &builder.config.build);
 
         builder.info(&format!("Testing error-index stage{}", compiler.stage));
         let _time = util::timeit(&builder);