New upstream version 1.14.0+dfsg1

[rustc.git] / src / librustc_mir / transform / deaggregator.rs

diff --git a/src/librustc_mir/transform/deaggregator.rs b/src/librustc_mir/transform/deaggregator.rs
index 77af02c18c60ed3cb37f94e3a85b7f19e07c3c9d..fcdeae6d6c080187124464aa9799b20a23e0dd2b 100644 (file)
--- a/src/librustc_mir/transform/deaggregator.rs
+++ b/src/librustc_mir/transform/deaggregator.rs
@@ -9,10 +9,9 @@
 // except according to those terms.
 
 use rustc::ty::TyCtxt;
-use rustc::mir::repr::*;
+use rustc::mir::*;
 use rustc::mir::transform::{MirPass, MirSource, Pass};
 use rustc_data_structures::indexed_vec::Idx;
-use rustc::ty::VariantKind;
 
 pub struct Deaggregator;
 
@@ -129,10 +128,7 @@ fn get_aggregate_statement_index<'a, 'tcx, 'b>(start: usize,
         }
         debug!("getting variant {:?}", variant);
         debug!("for adt_def {:?}", adt_def);
-        let variant_def = &adt_def.variants[variant];
-        if variant_def.kind == VariantKind::Struct {
-            return Some(i);
-        }
+        return Some(i);
     };
     None
 }