Rollup merge of #67867 - matthewjasper:opaque-assoc-lookup, r=oli-obk

[rust.git] / src / librustc_session / options.rs

diff --git a/src/librustc_session/options.rs b/src/librustc_session/options.rs
index 38c17bbbde7973d226e8978bffeafd3282f999be..4b5736adc17c3f0d4de30fed1499ece9bae4792a 100644 (file)
--- a/src/librustc_session/options.rs
+++ b/src/librustc_session/options.rs
@@ -9,7 +9,7 @@
 use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelroLevel};
 
 use rustc_feature::UnstableFeatures;
-use syntax_pos::edition::Edition;
+use rustc_span::edition::Edition;
 
 use getopts;
 
@@ -772,8 +772,6 @@ fn parse_symbol_mangling_version(
         "set the current terminal width"),
     panic_abort_tests: bool = (false, parse_bool, [TRACKED],
         "support compiling tests with panic=abort"),
-    continue_parse_after_error: bool = (false, parse_bool, [TRACKED],
-        "attempt to recover from parse errors (experimental)"),
     dep_tasks: bool = (false, parse_bool, [UNTRACKED],
         "print tasks that execute and the color their dep node gets (requires debug build)"),
     incremental: Option<String> = (None, parse_opt_string, [UNTRACKED],
@@ -904,7 +902,7 @@ fn parse_symbol_mangling_version(
         `mir` (the MIR), or `mir-cfg` (graphviz formatted MIR)"),
     run_dsymutil: Option<bool> = (None, parse_opt_bool, [TRACKED],
         "run `dsymutil` and delete intermediate object files"),
-    ui_testing: bool = (false, parse_bool, [UNTRACKED],
+    ui_testing: Option<bool> = (None, parse_opt_bool, [UNTRACKED],
         "format compiler diagnostics in a way that's better suitable for UI testing"),
     embed_bitcode: bool = (false, parse_bool, [TRACKED],
         "embed LLVM bitcode in object files"),
@@ -946,4 +944,6 @@ fn parse_symbol_mangling_version(
     insert_sideeffect: bool = (false, parse_bool, [TRACKED],
         "fix undefined behavior when a thread doesn't eventually make progress \
          (such as entering an empty infinite loop) by inserting llvm.sideeffect"),
+    deduplicate_diagnostics: Option<bool> = (None, parse_opt_bool, [UNTRACKED],
+        "deduplicate identical diagnostics"),
 }