From 91a096a9b8c05011c1a76e7ceb578000ce1e91f6 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Fri, 4 Oct 2019 10:31:28 -0400
Subject: [PATCH] move middle::liveness to rustc_passes

---
 src/librustc/lib.rs                           |  1 -
 src/librustc_interface/passes.rs              |  1 -
 src/librustc_passes/lib.rs                    |  2 ++
 .../middle => librustc_passes}/liveness.rs    | 26 +++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename src/{librustc/middle => librustc_passes}/liveness.rs (99%)

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index bd9899b644b..b522de7d43d 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -111,7 +111,6 @@ pub mod middle {
     pub mod intrinsicck;
     pub mod lib_features;
     pub mod lang_items;
-    pub mod liveness;
     pub mod mem_categorization;
     pub mod privacy;
     pub mod reachable;
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index bf5e86017fc..ef9da5c2bde 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -781,7 +781,6 @@ pub fn default_provide(providers: &mut ty::query::Providers<'_>) {
     traits::provide(providers);
     stability::provide(providers);
     middle::intrinsicck::provide(providers);
-    middle::liveness::provide(providers);
     reachable::provide(providers);
     rustc_passes::provide(providers);
     rustc_traits::provide(providers);
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index 6c7958fb365..7aa353cec08 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -22,7 +22,9 @@ pub mod ast_validation;
 pub mod hir_stats;
 pub mod layout_test;
 pub mod loops;
+mod liveness;
 
 pub fn provide(providers: &mut Providers<'_>) {
     loops::provide(providers);
+    liveness::provide(providers);
 }
diff --git a/src/librustc/middle/liveness.rs b/src/librustc_passes/liveness.rs
similarity index 99%
rename from src/librustc/middle/liveness.rs
rename to src/librustc_passes/liveness.rs
index a654a26eb0b..fb06808619f 100644
--- a/src/librustc/middle/liveness.rs
+++ b/src/librustc_passes/liveness.rs
@@ -96,17 +96,17 @@
 use self::LiveNodeKind::*;
 use self::VarKind::*;
 
-use crate::hir;
-use crate::hir::{Expr, HirId};
-use crate::hir::def::*;
-use crate::hir::def_id::DefId;
-use crate::hir::intravisit::{self, Visitor, FnKind, NestedVisitorMap};
-use crate::hir::Node;
-use crate::hir::ptr::P;
-use crate::ty::{self, TyCtxt};
-use crate::ty::query::Providers;
-use crate::lint;
-use crate::util::nodemap::{HirIdMap, HirIdSet};
+use rustc::hir;
+use rustc::hir::{Expr, HirId};
+use rustc::hir::def::*;
+use rustc::hir::def_id::DefId;
+use rustc::hir::intravisit::{self, Visitor, FnKind, NestedVisitorMap};
+use rustc::hir::Node;
+use rustc::hir::ptr::P;
+use rustc::ty::{self, TyCtxt};
+use rustc::ty::query::Providers;
+use rustc::lint;
+use rustc::util::nodemap::{HirIdMap, HirIdSet};
 
 use errors::Applicability;
 use rustc_data_structures::fx::FxIndexMap;
@@ -373,7 +373,7 @@ fn visit_fn<'tcx>(
 
     for param in &body.params {
         let is_shorthand = match param.pat.kind {
-            crate::hir::PatKind::Struct(..) => true,
+            rustc::hir::PatKind::Struct(..) => true,
             _ => false,
         };
         param.pat.each_binding(|_bm, hir_id, _x, ident| {
@@ -411,7 +411,7 @@ fn add_from_pat(ir: &mut IrMaps<'_>, pat: &P<hir::Pat>) {
     let mut pats = VecDeque::new();
     pats.push_back(pat);
     while let Some(pat) = pats.pop_front() {
-        use crate::hir::PatKind::*;
+        use rustc::hir::PatKind::*;
         match &pat.kind {
             Binding(.., inner_pat) => {
                 pats.extend(inner_pat.iter());