about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2017-11-10 14:23:51 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2017-11-14 08:52:26 +0200
commitc79e8f4d1d077b7c56875c2eb4dfd64dbc5ebba1 (patch)
treec5dac85a7efadfce7fe0ba483a992fd71af1ea2c /src
parentc5022f2f16f380c4847b75d66c20f638b2fd1919 (diff)
downloadrust-c79e8f4d1d077b7c56875c2eb4dfd64dbc5ebba1.tar.gz
rust-c79e8f4d1d077b7c56875c2eb4dfd64dbc5ebba1.zip
rustc: remove unused MirSource::GeneratorDrop.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/mir/transform.rs4
-rw-r--r--src/librustc_mir/build/scope.rs3
-rw-r--r--src/librustc_mir/hair/cx/mod.rs1
-rw-r--r--src/librustc_mir/transform/copy_prop.rs1
-rw-r--r--src/librustc_mir/transform/qualify_consts.rs1
-rw-r--r--src/librustc_mir/util/pretty.rs4
6 files changed, 2 insertions, 12 deletions
diff --git a/src/librustc/mir/transform.rs b/src/librustc/mir/transform.rs
index 339c270e3aa..00f8926711e 100644
--- a/src/librustc/mir/transform.rs
+++ b/src/librustc/mir/transform.rs
@@ -31,9 +31,6 @@ pub enum MirSource {
 
     /// Promoted rvalues within a function.
     Promoted(NodeId, Promoted),
-
-    /// Drop glue for a generator.
-    GeneratorDrop(NodeId),
 }
 
 impl<'a, 'gcx, 'tcx> MirSource {
@@ -70,7 +67,6 @@ impl<'a, 'gcx, 'tcx> MirSource {
         match *self {
             MirSource::Fn(id) |
             MirSource::Const(id) |
-            MirSource::GeneratorDrop(id) |
             MirSource::Static(id, _) |
             MirSource::Promoted(id, _) => id
         }
diff --git a/src/librustc_mir/build/scope.rs b/src/librustc_mir/build/scope.rs
index c0d17a1590f..07d5f69eeed 100644
--- a/src/librustc_mir/build/scope.rs
+++ b/src/librustc_mir/build/scope.rs
@@ -603,8 +603,7 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                 None,
             MirSource::Fn(_) =>
                 Some(self.topmost_scope()),
-            MirSource::Promoted(..) |
-            MirSource::GeneratorDrop(..) =>
+            MirSource::Promoted(..) =>
                 bug!(),
         }
     }
diff --git a/src/librustc_mir/hair/cx/mod.rs b/src/librustc_mir/hair/cx/mod.rs
index 4434df0ac3e..9d88b1b0a16 100644
--- a/src/librustc_mir/hair/cx/mod.rs
+++ b/src/librustc_mir/hair/cx/mod.rs
@@ -64,7 +64,6 @@ impl<'a, 'gcx, 'tcx> Cx<'a, 'gcx, 'tcx> {
         let constness = match src {
             MirSource::Const(_) |
             MirSource::Static(..) => hir::Constness::Const,
-            MirSource::GeneratorDrop(..) => hir::Constness::NotConst,
             MirSource::Fn(id) => {
                 let fn_like = FnLikeNode::from_node(infcx.tcx.hir.get(id));
                 fn_like.map_or(hir::Constness::NotConst, |f| f.constness())
diff --git a/src/librustc_mir/transform/copy_prop.rs b/src/librustc_mir/transform/copy_prop.rs
index bc7da12ddc1..ea72125274c 100644
--- a/src/librustc_mir/transform/copy_prop.rs
+++ b/src/librustc_mir/transform/copy_prop.rs
@@ -61,7 +61,6 @@ impl MirPass for CopyPropagation {
                     return
                 }
             }
-            MirSource::GeneratorDrop(_) => (),
         }
 
         // We only run when the MIR optimization level is > 1.
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 059d64b4676..318406549ac 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -979,7 +979,6 @@ impl MirPass for QualifyAndPromoteConstants {
             }
             MirSource::Static(_, hir::MutImmutable) => Mode::Static,
             MirSource::Static(_, hir::MutMutable) => Mode::StaticMut,
-            MirSource::GeneratorDrop(_) |
             MirSource::Promoted(..) => return
         };
 
diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index 927d885f2c9..95df07f06f4 100644
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -114,7 +114,6 @@ where
 {
     let promotion_id = match source {
         MirSource::Promoted(_, id) => format!("-{:?}", id),
-        MirSource::GeneratorDrop(_) => format!("-drop"),
         _ => String::new()
     };
 
@@ -374,7 +373,6 @@ fn write_mir_sig(tcx: TyCtxt, src: MirSource, mir: &Mir, w: &mut Write)
         MirSource::Static(_, hir::MutImmutable) => write!(w, "static")?,
         MirSource::Static(_, hir::MutMutable) => write!(w, "static mut")?,
         MirSource::Promoted(_, i) => write!(w, "{:?} in", i)?,
-        MirSource::GeneratorDrop(_) => write!(w, "drop_glue")?,
     }
 
     item_path::with_forced_impl_filename_line(|| { // see notes on #41697 elsewhere
@@ -382,7 +380,7 @@ fn write_mir_sig(tcx: TyCtxt, src: MirSource, mir: &Mir, w: &mut Write)
     })?;
 
     match src {
-        MirSource::Fn(_) | MirSource::GeneratorDrop(_) => {
+        MirSource::Fn(_) => {
             write!(w, "(")?;
 
             // fn argument types.