about summary refs log tree commit diff
path: root/compiler/rustc_interface/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-12-05 15:33:44 +0000
committerbors <bors@rust-lang.org>2021-12-05 15:33:44 +0000
commit772d51f887fa407216860bf8ecf3f1a32fb795b4 (patch)
tree6cc810a001d14c899753667d1a02c6248a57b3e0 /compiler/rustc_interface/src
parent1597728ef5820d3ffcb9d3f0c890ef7802398751 (diff)
parent068b30420aea9ab762d3159cc084fb6c3cc688fd (diff)
downloadrust-772d51f887fa407216860bf8ecf3f1a32fb795b4.tar.gz
rust-772d51f887fa407216860bf8ecf3f1a32fb795b4.zip
Auto merge of #91555 - matthiaskrgr:rollup-pq0iaq7, r=matthiaskrgr
Rollup of 4 pull requests

Successful merges:

 - #90529 (Skip reborrows in AbstractConstBuilder)
 - #91437 (Pretty print empty blocks as {})
 - #91450 (Don't suggest types whose inner type is erroneous)
 - #91535 (Stabilize `-Z emit-future-incompat` as `--json future-incompat`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
-rw-r--r--compiler/rustc_interface/src/tests.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs
index 6147311af61..c651feaaa66 100644
--- a/compiler/rustc_interface/src/tests.rs
+++ b/compiler/rustc_interface/src/tests.rs
@@ -651,7 +651,6 @@ fn test_debugging_options_tracking_hash() {
     untracked!(dump_mir_dir, String::from("abc"));
     untracked!(dump_mir_exclude_pass_number, true);
     untracked!(dump_mir_graphviz, true);
-    untracked!(emit_future_incompat_report, true);
     untracked!(emit_stack_sizes, true);
     untracked!(future_incompat_test, true);
     untracked!(hir_stats, true);