From 382285a01de393ecc9dd2c78c2518299d8749c12 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Fri, 20 Jul 2018 12:45:07 +0300
Subject: [PATCH] Revert some use of `PtrKey` to fix parallel_queries build

---
 src/librustc/ty/query/job.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/librustc/ty/query/job.rs b/src/librustc/ty/query/job.rs
index 6cc71642c42a..56a8c13a8d3b 100644
--- a/src/librustc/ty/query/job.rs
+++ b/src/librustc/ty/query/job.rs
@@ -11,7 +11,6 @@
 #![allow(warnings)]
 
 use std::mem;
-use rustc_data_structures::ptr_key::PtrKey;
 use rustc_data_structures::sync::{Lock, LockGuard, Lrc, Weak};
 use rustc_data_structures::OnDrop;
 use syntax_pos::Span;
@@ -283,7 +282,7 @@ where
 fn cycle_check<'tcx>(query: Lrc<QueryJob<'tcx>>,
                      span: Span,
                      stack: &mut Vec<(Span, Lrc<QueryJob<'tcx>>)>,
-                     visited: &mut HashSet<PtrKey<'tcx, QueryJob<'tcx>>>
+                     visited: &mut HashSet<*const QueryJob<'tcx>>
 ) -> Option<Option<Waiter<'tcx>>> {
     if visited.contains(&query.as_ptr()) {
         return if let Some(p) = stack.iter().position(|q| q.1.as_ptr() == query.as_ptr()) {
@@ -322,7 +321,7 @@ fn cycle_check<'tcx>(query: Lrc<QueryJob<'tcx>>,
 #[cfg(parallel_queries)]
 fn connected_to_root<'tcx>(
     query: Lrc<QueryJob<'tcx>>,
-    visited: &mut HashSet<PtrKey<'tcx, QueryJob<'tcx>>>
+    visited: &mut HashSet<*const QueryJob<'tcx>>
 ) -> bool {
     // We already visited this or we're deliberately ignoring it
     if visited.contains(&query.as_ptr()) {