rename MirPassSet to MirSuite

This seems like a better noun.

src/librustc_mir/transform/mod.rs

@@ -10,7 +10,7 @@
 
 use rustc::hir::def_id::DefId;
 use rustc::mir::Mir;
-use rustc::mir::transform::{MirCtxt, MirPassIndex, MirPassSet, MirSource, MIR_OPTIMIZED};
+use rustc::mir::transform::{MirCtxt, MirPassIndex, MirSuite, MirSource, MIR_OPTIMIZED};
 use rustc::ty::TyCtxt;
 use rustc::ty::maps::Providers;
 use std::cell::{Ref, RefCell};
@@ -34,14 +34,14 @@ pub fn provide(providers: &mut Providers) {
     self::qualify_consts::provide(providers);
     *providers = Providers {
         optimized_mir,
-        mir_pass_set,
+        mir_suite,
         mir_pass,
         ..*providers
     };
 }
 
 fn optimized_mir<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> &'tcx RefCell<Mir<'tcx>> {
-    let mir = tcx.mir_pass_set((MIR_OPTIMIZED, def_id));
+    let mir = tcx.mir_suite((MIR_OPTIMIZED, def_id));
 
     // "lock" the ref cell into read mode; after this point,
     // there ought to be no more changes to the MIR.
@@ -50,23 +50,23 @@ fn optimized_mir<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> &'tcx
     mir
 }
 
-fn mir_pass_set<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                          (pass_set, def_id): (MirPassSet, DefId))
-                          -> &'tcx RefCell<Mir<'tcx>>
+fn mir_suite<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
+                       (suite, def_id): (MirSuite, DefId))
+                       -> &'tcx RefCell<Mir<'tcx>>
 {
     let passes = &tcx.mir_passes;
-    let len = passes.len_passes(pass_set);
-    assert!(len > 0, "no passes in {:?}", pass_set);
-    tcx.mir_pass((pass_set, MirPassIndex(len - 1), def_id))
+    let len = passes.len_passes(suite);
+    assert!(len > 0, "no passes in {:?}", suite);
+    tcx.mir_pass((suite, MirPassIndex(len - 1), def_id))
 }
 
 fn mir_pass<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
-                      (pass_set, pass_num, def_id): (MirPassSet, MirPassIndex, DefId))
+                      (suite, pass_num, def_id): (MirSuite, MirPassIndex, DefId))
                       -> &'tcx RefCell<Mir<'tcx>>
 {
     let passes = &tcx.mir_passes;
-    let pass = passes.pass(pass_set, pass_num);
-    let mir_ctxt = MirCtxtImpl { tcx, pass_num, pass_set, def_id };
+    let pass = passes.pass(suite, pass_num);
+    let mir_ctxt = MirCtxtImpl { tcx, pass_num, suite, def_id };
 
     for hook in passes.hooks() {
         hook.on_mir_pass(&mir_ctxt, None);
@@ -84,7 +84,7 @@ fn mir_pass<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
 struct MirCtxtImpl<'a, 'tcx: 'a> {
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     pass_num: MirPassIndex,
-    pass_set: MirPassSet,
+    suite: MirSuite,
     def_id: DefId
 }
 
@@ -93,8 +93,8 @@ impl<'a, 'tcx> MirCtxt<'a, 'tcx> for MirCtxtImpl<'a, 'tcx> {
         self.tcx
     }
 
-    fn pass_set(&self) -> MirPassSet {
-        self.pass_set
+    fn suite(&self) -> MirSuite {
+        self.suite
     }
 
     fn pass_num(&self) -> MirPassIndex {
@@ -116,12 +116,12 @@ impl<'a, 'tcx> MirCtxt<'a, 'tcx> for MirCtxtImpl<'a, 'tcx> {
     }
 
     fn steal_previous_mir(&self) -> &'tcx RefCell<Mir<'tcx>> {
-        let MirPassSet(pass_set) = self.pass_set;
+        let MirSuite(suite) = self.suite;
         let MirPassIndex(pass_num) = self.pass_num;
         if pass_num > 0 {
-            self.tcx.mir_pass((MirPassSet(pass_set), MirPassIndex(pass_num - 1), self.def_id))
-        } else if pass_set > 0 {
-            self.tcx.mir_pass_set((MirPassSet(pass_set - 1), self.def_id))
+            self.tcx.mir_pass((MirSuite(suite), MirPassIndex(pass_num - 1), self.def_id))
+        } else if suite > 0 {
+            self.tcx.mir_suite((MirSuite(suite - 1), self.def_id))
         } else {
             self.tcx.mir_build(self.def_id)
         }