From 79bde05b4584db1183d25a78a3dd4eb377dcb01a Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sat, 9 Nov 2019 23:32:17 +0100
Subject: [PATCH] Derive HashStable for PanicStrategy.

---
 src/librustc/ich/impls_misc.rs  | 7 -------
 src/librustc/ich/mod.rs         | 1 -
 src/librustc_target/spec/mod.rs | 4 +++-
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 src/librustc/ich/impls_misc.rs

diff --git a/src/librustc/ich/impls_misc.rs b/src/librustc/ich/impls_misc.rs
deleted file mode 100644
index 417305139e4..00000000000
--- a/src/librustc/ich/impls_misc.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! This module contains `HashStable` implementations for various data types
-//! that don't fit into any of the other impls_xxx modules.
-
-impl_stable_hash_for!(enum ::rustc_target::spec::PanicStrategy {
-    Abort,
-    Unwind
-});
diff --git a/src/librustc/ich/mod.rs b/src/librustc/ich/mod.rs
index f3fc7ec8fda..9e985ffb14c 100644
--- a/src/librustc/ich/mod.rs
+++ b/src/librustc/ich/mod.rs
@@ -10,7 +10,6 @@ mod caching_source_map_view;
 mod hcx;
 
 mod impls_hir;
-mod impls_misc;
 mod impls_ty;
 mod impls_syntax;
 
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
index 4cd2f13d09c..716aef056a3 100644
--- a/src/librustc_target/spec/mod.rs
+++ b/src/librustc_target/spec/mod.rs
@@ -42,6 +42,8 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use crate::spec::abi::{Abi, lookup as lookup_abi};
 
+use rustc_macros::HashStable_Generic;
+
 pub mod abi;
 mod android_base;
 mod apple_base;
@@ -153,7 +155,7 @@ flavor_mappings! {
     ((LinkerFlavor::Lld(LldFlavor::Link)), "lld-link"),
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Hash, RustcEncodable, RustcDecodable)]
+#[derive(Clone, Copy, Debug, PartialEq, Hash, RustcEncodable, RustcDecodable, HashStable_Generic)]
 pub enum PanicStrategy {
     Unwind,
     Abort,