Revert "replace Idx with NodeIndex. not finished!"

This reverts commit c67c1b6.

Author: scottcarr

src/librustc/mir/repr.rs

@@ -11,7 +11,8 @@
 use graphviz::IntoCow;
 use middle::const_val::ConstVal;
 use rustc_const_math::{ConstUsize, ConstInt, ConstMathErr};
-use rustc_data_structures::indexed_vec::{IndexVec, NodeIndex};
+use rustc_data_structures::indexed_vec::{IndexVec, Idx};
+use rustc_data_structures::graph_algorithms::NodeIndex;
 use hir::def_id::DefId;
 use ty::subst::Substs;
 use ty::{self, AdtDef, ClosureSubsts, FnOutput, Region, Ty};
@@ -35,17 +36,12 @@ macro_rules! newtype_index {
          RustcEncodable, RustcDecodable)]
         pub struct $name(u32);
 
-        impl NodeIndex for $name {}
-
-        impl From<usize> for $name {
-            fn from(value: usize) -> Self {
+        impl Idx for $name {
+            fn new(value: usize) -> Self {
                 assert!(value < (u32::MAX) as usize);
                 $name(value as u32)
             }
-        }
-
-        impl Into<usize> for $name {
-            fn into(self) -> usize {
+            fn index(self) -> usize {
                 self.0 as usize
             }
         }
@@ -167,17 +163,23 @@ impl<'tcx> IndexMut<BasicBlock> for Mir<'tcx> {
     }
 }
 
-//impl From<usize> for BasicBlock {
-//    fn from(n: usize) -> BasicBlock {
-//        assert!(n < (u32::MAX as usize));
-//        BasicBlock(n as u32)
-//    }
-//}
-//impl Into<usize> for BasicBlock {
-//    fn into(self: BasicBlock) -> usize {
-//        self.index()
-//    }
-//}
+impl From<usize> for BasicBlock {
+    fn from(n: usize) -> BasicBlock {
+        assert!(n < (u32::MAX as usize));
+        BasicBlock(n as u32)
+    }
+}
+impl Into<usize> for BasicBlock {
+    fn into(self: BasicBlock) -> usize {
+        self.index()
+    }
+}
+
+impl NodeIndex for BasicBlock {
+    fn as_usize(self) -> usize {
+        self.index()
+    }
+}
 
 /// Grouped information about the source code origin of a MIR entity.
 /// Intended to be inspected by diagnostics and debuginfo.
@@ -803,7 +805,7 @@ impl<'tcx> Debug for Lvalue<'tcx> {
                     ProjectionElem::Deref =>
                         write!(fmt, "(*{:?})", data.base),
                     ProjectionElem::Field(field, ty) =>
-                        write!(fmt, "({:?}.{:?}: {:?})", data.base, field, ty),
+                        write!(fmt, "({:?}.{:?}: {:?})", data.base, field.index(), ty),
                     ProjectionElem::Index(ref index) =>
                         write!(fmt, "{:?}[{:?}]", data.base, index),
                     ProjectionElem::ConstantIndex { offset, min_length, from_end: false } =>

src/librustc/mir/traversal.rs

@@ -11,7 +11,7 @@
 use std::vec;
 
 use rustc_data_structures::bitvec::BitVector;
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 
 use super::repr::*;
 
@@ -60,7 +60,7 @@ impl<'a, 'tcx> Iterator for Preorder<'a, 'tcx> {
 
     fn next(&mut self) -> Option<(BasicBlock, &'a BasicBlockData<'tcx>)> {
         while let Some(idx) = self.worklist.pop() {
-            if !self.visited.insert(idx.into()) {
+            if !self.visited.insert(idx.index()) {
                 continue;
             }
 
@@ -115,7 +115,7 @@ impl<'a, 'tcx> Postorder<'a, 'tcx> {
         let data = &po.mir[root];
 
         if let Some(ref term) = data.terminator {
-            po.visited.insert(root.into());
+            po.visited.insert(root.index());
 
             let succs = term.successors().into_owned().into_iter();
 
@@ -185,7 +185,7 @@ impl<'a, 'tcx> Postorder<'a, 'tcx> {
                 break;
             };
 
-            if self.visited.insert(bb.into()) {
+            if self.visited.insert(bb.index()) {
                 if let Some(ref term) = self.mir[bb].terminator {
                     let succs = term.successors().into_owned().into_iter();
                     self.visit_stack.push((bb, succs));

src/librustc/mir/visit.rs

@@ -15,7 +15,7 @@ use ty::{ClosureSubsts, FnOutput, Region, Ty};
 use mir::repr::*;
 use rustc_const_math::ConstUsize;
 use rustc_data_structures::tuple_slice::TupleSlice;
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 use syntax::codemap::Span;
 
 // # The MIR Visitor
@@ -253,7 +253,7 @@ macro_rules! make_mir_visitor {
             fn super_mir(&mut self,
                          mir: & $($mutability)* Mir<'tcx>) {
                 for index in 0..mir.basic_blocks().len() {
-                    let block = BasicBlock::from(index);
+                    let block = BasicBlock::new(index);
                     self.visit_basic_block_data(block, &$($mutability)* mir[block]);
                 }
 

src/librustc_borrowck/borrowck/mir/dataflow/graphviz.rs

@@ -12,7 +12,7 @@
 
 use syntax::ast::NodeId;
 use rustc::mir::repr::{BasicBlock, Mir};
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 
 use dot;
 use dot::IntoCow;

src/librustc_borrowck/borrowck/mir/dataflow/impls.rs

@@ -10,7 +10,7 @@
 
 use rustc::ty::TyCtxt;
 use rustc::mir::repr::{self, Mir};
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 
 use super::super::gather_moves::{Location};
 use super::super::gather_moves::{MoveOutIndex, MovePathIndex};

src/librustc_borrowck/borrowck/mir/dataflow/mod.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 
 use rustc::ty::TyCtxt;
 use rustc::mir::repr::{self, Mir};
@@ -167,15 +167,15 @@ impl<'a, 'tcx: 'a, BD> MirBorrowckCtxtPreDataflow<'a, 'tcx, BD>
 
 /// Maps each block to a set of bits
 #[derive(Debug)]
-struct Bits<E:NodeIndex> {
+struct Bits<E:Idx> {
     bits: IdxSetBuf<E>,
 }
 
-impl<E:NodeIndex> Clone for Bits<E> {
+impl<E:Idx> Clone for Bits<E> {
     fn clone(&self) -> Self { Bits { bits: self.bits.clone() } }
 }
 
-impl<E:NodeIndex> Bits<E> {
+impl<E:Idx> Bits<E> {
     fn new(bits: IdxSetBuf<E>) -> Self {
         Bits { bits: bits }
     }
@@ -221,7 +221,7 @@ pub struct DataflowState<O: BitDenotation>
 }
 
 #[derive(Debug)]
-pub struct AllSets<E: NodeIndex> {
+pub struct AllSets<E: Idx> {
     /// Analysis bitwidth for each block.
     bits_per_block: usize,
 
@@ -243,13 +243,13 @@ pub struct AllSets<E: NodeIndex> {
     on_entry_sets: Bits<E>,
 }
 
-pub struct BlockSets<'a, E: NodeIndex> {
+pub struct BlockSets<'a, E: Idx> {
     on_entry: &'a mut IdxSet<E>,
     gen_set: &'a mut IdxSet<E>,
     kill_set: &'a mut IdxSet<E>,
 }
 
-impl<'a, E:NodeIndex> BlockSets<'a, E> {
+impl<'a, E:Idx> BlockSets<'a, E> {
     fn gen(&mut self, e: &E) {
         self.gen_set.add(e);
         self.kill_set.remove(e);
@@ -260,7 +260,7 @@ impl<'a, E:NodeIndex> BlockSets<'a, E> {
     }
 }
 
-impl<E:NodeIndex> AllSets<E> {
+impl<E:Idx> AllSets<E> {
     pub fn bits_per_block(&self) -> usize { self.bits_per_block }
     pub fn for_block(&mut self, block_idx: usize) -> BlockSets<E> {
         let offset = self.words_per_block * block_idx;
@@ -296,7 +296,7 @@ pub trait DataflowOperator: BitwiseOperator {
 
 pub trait BitDenotation {
     /// Specifies what index type is used to access the bitvector.
-    type Idx: NodeIndex;
+    type Idx: Idx;
 
     /// Specifies what, if any, separate context needs to be supplied for methods below.
     type Ctxt;

src/librustc_borrowck/borrowck/mir/dataflow/sanity_check.rs

@@ -14,7 +14,7 @@ use syntax::codemap::Span;
 
 use rustc::ty::{self, TyCtxt};
 use rustc::mir::repr::{self, Mir};
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 
 use super::super::gather_moves::{MovePathIndex};
 use super::super::MoveDataParamEnv;

src/librustc_borrowck/borrowck/mir/elaborate_drops.rs

@@ -22,7 +22,7 @@ use rustc::mir::transform::{Pass, MirPass, MirSource};
 use rustc::middle::const_val::ConstVal;
 use rustc::middle::lang_items;
 use rustc::util::nodemap::FnvHashMap;
-use rustc_data_structures::indexed_vec::NodeIndex;
+use rustc_data_structures::indexed_vec::Idx;
 use syntax::codemap::Span;
 
 use std::fmt;

src/librustc_borrowck/borrowck/mir/gather_moves.rs

@@ -12,7 +12,7 @@
 use rustc::ty::{FnOutput, TyCtxt};
 use rustc::mir::repr::*;
 use rustc::util::nodemap::FnvHashMap;
-use rustc_data_structures::indexed_vec::{NodeIndex, IndexVec};
+use rustc_data_structures::indexed_vec::{Idx, IndexVec};
 
 use std::cell::{Cell};
 use std::collections::hash_map::Entry;
@@ -29,25 +29,21 @@ use super::abs_domain::{AbstractElem, Lift};
 // (which is likely to yield a subtle off-by-one error).
 mod indexes {
     use core::nonzero::NonZero;
-    use rustc_data_structures::indexed_vec::NodeIndex;
+    use rustc_data_structures::indexed_vec::Idx;
 
     macro_rules! new_index {
         ($Index:ident) => {
-            #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash, Ord, PartialOrd)]
+            #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
             pub struct $Index(NonZero<usize>);
 
             impl $Index {
             }
 
-            impl NodeIndex for $Index {
-            }
-            impl From<usize> for $Index {
-                fn from(idx: usize) -> Self {
+            impl Idx for $Index {
+                fn new(idx: usize) -> Self {
                     unsafe { $Index(NonZero::new(idx + 1)) }
                 }
-            }
-            impl Into<usize> for $Index {
-                fn into(self) -> usize {
+                fn index(self) -> usize {
                     *self.0 - 1
                 }
             }
@@ -317,7 +313,7 @@ impl<'tcx> MovePathLookup<'tcx> {
         i
     }
 
-    fn lookup_or_generate<I: NodeIndex>(vec: &mut IndexVec<I, Option<MovePathIndex>>,
+    fn lookup_or_generate<I: Idx>(vec: &mut IndexVec<I, Option<MovePathIndex>>,
                                   idx: I,
                                   next_index: &mut MovePathIndex)
                                   -> Lookup<MovePathIndex> {

src/librustc_borrowck/borrowck/mir/patch.rs

@@ -11,7 +11,7 @@
 use super::gather_moves::Location;
 use rustc::ty::Ty;
 use rustc::mir::repr::*;
-use rustc_data_structures::indexed_vec::{IndexVec, NodeIndex};
+use rustc_data_structures::indexed_vec::{IndexVec, Idx};
 
 /// This struct represents a patch to MIR, which can add
 /// new statements and basic blocks and patch over block