From 124fd9d2a43bfadfb3f05b5a7fb46ce884357818 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Wed, 1 Jan 2020 17:31:03 +0100
Subject: [PATCH] Move upvars query to librustc_passes.

---
 src/librustc/hir/mod.rs       | 2 --
 src/librustc_passes/lib.rs    | 2 ++
 src/librustc_passes/upvars.rs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index 9f4d04a49781..6275c0aabe89 100644
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -5,11 +5,9 @@
 pub mod check_attr;
 pub mod exports;
 pub mod map;
-pub mod upvars;
 
 use crate::ty::query::Providers;
 
 pub fn provide(providers: &mut Providers<'_>) {
     map::provide(providers);
-    upvars::provide(providers);
 }
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index 5494a652bc84..4c0fd903db09 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -31,6 +31,7 @@ pub mod loops;
 mod reachable;
 mod region;
 pub mod stability;
+mod upvars;
 
 pub fn provide(providers: &mut Providers<'_>) {
     check_attr::provide(providers);
@@ -44,4 +45,5 @@ pub fn provide(providers: &mut Providers<'_>) {
     reachable::provide(providers);
     region::provide(providers);
     stability::provide(providers);
+    upvars::provide(providers);
 }
diff --git a/src/librustc_passes/upvars.rs b/src/librustc_passes/upvars.rs
index 4ca294f48615..a2397f273385 100644
--- a/src/librustc_passes/upvars.rs
+++ b/src/librustc_passes/upvars.rs
@@ -1,8 +1,8 @@
 //! Upvar (closure capture) collection from cross-body HIR uses of `Res::Local`s.
 
-use crate::hir::map::Map;
-use crate::ty::query::Providers;
-use crate::ty::TyCtxt;
+use rustc::hir::map::Map;
+use rustc::ty::query::Providers;
+use rustc::ty::TyCtxt;
 use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
 use rustc_hir as hir;
 use rustc_hir::def::Res;