about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2017-07-22 10:33:12 +1200
committerNick Cameron <ncameron@mozilla.com>2017-07-24 17:25:16 +1200
commit5134a5f02c38bc1dc115bf93aa88816fb113f2f5 (patch)
tree7d2013d06d41b8ed8f8956e091655e4f0fe6c15c
parentad8ecc20a24c1831a82e4d158efd2a5551bcbbe5 (diff)
downloadrust-5134a5f02c38bc1dc115bf93aa88816fb113f2f5.tar.gz
rust-5134a5f02c38bc1dc115bf93aa88816fb113f2f5.zip
Remove save-analysis-api references from tests and rustbuild
-rw-r--r--src/bootstrap/bin/rustc.rs5
-rw-r--r--src/test/run-make/save-analysis/Makefile1
2 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index 134406b1acd..ac2e3bc402a 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -185,7 +185,10 @@ fn main() {
 
         // Emit save-analysis info.
         if env::var("RUSTC_SAVE_ANALYSIS") == Ok("api".to_string()) {
-            cmd.arg("-Zsave-analysis-api");
+            cmd.arg("-Zsave-analysis");
+            cmd.env("RUST_SAVE_ANALYSIS_CONFIG",
+                    "{\"output_file\": null,\"full_docs\": false,\"pub_only\": true,\
+                     \"signatures\": false,\"borrow_data\": false}");
         }
 
         // Dealing with rpath here is a little special, so let's go into some
diff --git a/src/test/run-make/save-analysis/Makefile b/src/test/run-make/save-analysis/Makefile
index 9ebc40d4013..7296fb9cc59 100644
--- a/src/test/run-make/save-analysis/Makefile
+++ b/src/test/run-make/save-analysis/Makefile
@@ -4,4 +4,3 @@ krate2: krate2.rs
 	$(RUSTC) $<
 code: foo.rs krate2
 	$(RUSTC) foo.rs -Zsave-analysis
-	$(RUSTC) foo.rs -Zsave-analysis-api