From a0c38807cf5567cd380e80aa7c3ec8611d7e6604 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sun, 27 Nov 2022 10:28:28 +0000
Subject: [PATCH] Feedable queries must allow hashing.

---
 compiler/rustc_middle/src/ty/query.rs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/compiler/rustc_middle/src/ty/query.rs b/compiler/rustc_middle/src/ty/query.rs
index ba85d5c84982..ae246c819599 100644
--- a/compiler/rustc_middle/src/ty/query.rs
+++ b/compiler/rustc_middle/src/ty/query.rs
@@ -176,18 +176,6 @@ macro_rules! opt_remap_env_constness {
     };
 }
 
-macro_rules! hash_result {
-    ([]) => {{
-        Some(dep_graph::hash_result)
-    }};
-    ([(no_hash) $($rest:tt)*]) => {{
-        None
-    }};
-    ([$other:tt $($modifiers:tt)*]) => {
-        hash_result!([$($modifiers)*])
-    };
-}
-
 macro_rules! define_callbacks {
     (
      $($(#[$attr:meta])*
@@ -372,7 +360,7 @@ macro_rules! define_feedable {
                     tcx,
                     key,
                     &value,
-                    hash_result!([$($modifiers)*]).unwrap(),
+                    dep_graph::hash_result,
                 );
                 cache.complete(key, value, dep_node_index)
             })*