Rollup merge of #68079 - varkor:E0013-clarify, r=Centril

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

diff --git a/src/librustc_session/config.rs b/src/librustc_session/config.rs
index 75bd6babe16ec5607eb074e05a0ce1bd5513814c..b6b22e298ca6234725164416e38c81ea571ea3db 100644 (file)
--- a/src/librustc_session/config.rs
+++ b/src/librustc_session/config.rs
@@ -15,12 +15,12 @@
 
 use crate::parse::CrateConfig;
 use rustc_feature::UnstableFeatures;
-use syntax_pos::edition::{Edition, DEFAULT_EDITION, EDITION_NAME_LIST};
-use syntax_pos::source_map::{FileName, FilePathMapping};
-use syntax_pos::symbol::{sym, Symbol};
+use rustc_span::edition::{Edition, DEFAULT_EDITION, EDITION_NAME_LIST};
+use rustc_span::source_map::{FileName, FilePathMapping};
+use rustc_span::symbol::{sym, Symbol};
 
 use rustc_errors::emitter::HumanReadableErrorType;
-use rustc_errors::{ColorConfig, FatalError, Handler};
+use rustc_errors::{ColorConfig, FatalError, Handler, HandlerFlags};
 
 use getopts;
 
@@ -597,6 +597,17 @@ impl DebuggingOptions {
     pub fn ui_testing(&self) -> bool {
         self.ui_testing.unwrap_or(false)
     }
+
+    pub fn diagnostic_handler_flags(&self, can_emit_warnings: bool) -> HandlerFlags {
+        HandlerFlags {
+            can_emit_warnings,
+            treat_err_as_bug: self.treat_err_as_bug,
+            dont_buffer_diagnostics: self.dont_buffer_diagnostics,
+            report_delayed_bugs: self.report_delayed_bugs,
+            external_macro_backtrace: self.external_macro_backtrace,
+            deduplicate_diagnostics: self.deduplicate_diagnostics.unwrap_or(true),
+        }
+    }
 }
 
 // The type of entry function, so users can have their own entry functions
@@ -1966,12 +1977,12 @@ pub fn needs_analysis(&self) -> bool {
     use crate::lint;
     use crate::utils::NativeLibraryKind;
     use rustc_feature::UnstableFeatures;
+    use rustc_span::edition::Edition;
     use rustc_target::spec::{MergeFunctions, PanicStrategy, RelroLevel, TargetTriple};
     use std::collections::hash_map::DefaultHasher;
     use std::collections::BTreeMap;
     use std::hash::Hash;
     use std::path::PathBuf;
-    use syntax_pos::edition::Edition;
 
     pub trait DepTrackingHash {
         fn hash(&self, hasher: &mut DefaultHasher, error_format: ErrorOutputType);