From: Mark Rousskov Date: Sun, 24 Nov 2019 21:59:56 +0000 (-0500) Subject: Move ErrorReported to rustc_errors X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2299586ffc3b635c4bb90c15cd0ad92e1ea3128d;p=rust.git Move ErrorReported to rustc_errors --- diff --git a/src/librustc/util/common.rs b/src/librustc/util/common.rs index 3e52a6aa508..8581a5b220a 100644 --- a/src/librustc/util/common.rs +++ b/src/librustc/util/common.rs @@ -7,7 +7,6 @@ use std::time::{Duration, Instant}; use syntax::symbol::{Symbol, sym}; -use rustc_macros::HashStable; use crate::session::Session; #[cfg(test)] @@ -16,10 +15,7 @@ // 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 = Cell::new(0)); diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index 8a1799faaf8..ae587684818 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -993,3 +993,10 @@ 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, Hash, PartialEq, Eq)] +pub struct ErrorReported; + +rustc_data_structures::impl_stable_hash_via_hash!(ErrorReported);