Rollup merge of #66720 - Mark-Simulacrum:error-reported, r=Centril

Move ErrorReported to rustc_errors

The new location is more consistent with what this type is for, though we don't remove it from the old location (via a re-export) to avoid changing the dozens of use sites (~139 at this time).

Cargo.lock

@@ -3585,6 +3585,7 @@ dependencies = [
  "atty",
  "log",
  "rustc_data_structures",
+ "rustc_macros",
  "serialize",
  "syntax_pos",
  "term_size",

src/librustc/util/common.rs

@@ -7,7 +7,6 @@ use std::fmt::Debug;
 use std::time::{Duration, Instant};
 
 use syntax::symbol::{Symbol, sym};
-use rustc_macros::HashStable;
 use crate::session::Session;
 
 #[cfg(test)]
@@ -16,10 +15,7 @@ mod tests;
 // The name of the associated type for `Fn` return types.
 pub const FN_OUTPUT_NAME: Symbol = sym::Output;
 
-// Useful type to use with `Result<>` indicate that an error has already
-// been reported to the user, so no need to continue checking.
-#[derive(Clone, Copy, Debug, RustcEncodable, RustcDecodable, HashStable)]
-pub struct ErrorReported;
+pub use errors::ErrorReported;
 
 thread_local!(static TIME_DEPTH: Cell<usize> = Cell::new(0));
 

src/librustc_errors/Cargo.toml

@@ -19,3 +19,4 @@ atty = "0.2"
 termcolor = "1.0"
 annotate-snippets = "0.6.1"
 term_size = "0.3.1"
+rustc_macros = { path = "../librustc_macros" }

src/librustc_errors/lib.rs

@@ -20,6 +20,7 @@ use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
 use rustc_data_structures::stable_hasher::StableHasher;
 use syntax_pos::source_map::SourceMap;
 use syntax_pos::{Loc, Span, MultiSpan};
+use rustc_macros::HashStable_Generic;
 
 use std::borrow::Cow;
 use std::cell::Cell;
@@ -993,3 +994,8 @@ macro_rules! pluralize {
         if $x != 1 { "s" } else { "" }
     };
 }
+
+// Useful type to use with `Result<>` indicate that an error has already
+// been reported to the user, so no need to continue checking.
+#[derive(Clone, Copy, Debug, RustcEncodable, RustcDecodable, HashStable_Generic)]
+pub struct ErrorReported;