newtype_index: Support simpler serializable override, custom derive, and fix mir_opt tests

Author: Nashenas88

src/librustc/dep_graph/serialized.rs

@@ -14,7 +14,7 @@ use dep_graph::DepNode;
 use ich::Fingerprint;
 use rustc_data_structures::indexed_vec::{IndexVec, Idx};
 
-newtype_index!(SerializedDepNodeIndex { derive[RustcEncodable, RustcDecodable] });
+newtype_index!(SerializedDepNodeIndex);
 
 /// Data for use when recompiling the **current crate**.
 #[derive(Debug, RustcEncodable, RustcDecodable)]

src/librustc/hir/def_id.rs

@@ -18,6 +18,9 @@ use std::u32;
 
 newtype_index!(CrateNum nopub
     {
+        derive[Debug]
+        ENCODABLE = custom
+
         /// Item definitions in the currently-compiled crate would have the CrateNum
         /// LOCAL_CRATE in their DefId.
         const LOCAL_CRATE = 0,

src/librustc/middle/region.rs

@@ -156,12 +156,7 @@ pub struct BlockRemainder {
     pub first_statement_index: FirstStatementIndex,
 }
 
-newtype_index!(FirstStatementIndex
-    {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "",
-        MAX = SCOPE_DATA_REMAINDER_MAX,
-    });
+newtype_index!(FirstStatementIndex { MAX = SCOPE_DATA_REMAINDER_MAX });
 
 impl From<ScopeData> for Scope {
     #[inline]

src/librustc/mir/mod.rs

@@ -417,8 +417,7 @@ pub enum BorrowKind {
 
 newtype_index!(Local
     {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "_",
+        DEBUG_FORMAT = "_{}",
         const RETURN_POINTER = 0,
     });
 
@@ -554,11 +553,7 @@ pub struct UpvarDecl {
 ///////////////////////////////////////////////////////////////////////////
 // BasicBlock
 
-newtype_index!(BasicBlock
-    {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "bb"
-    });
+newtype_index!(BasicBlock { DEBUG_FORMAT = "bb{}" });
 
 ///////////////////////////////////////////////////////////////////////////
 // BasicBlockData and Terminator
@@ -1140,11 +1135,7 @@ pub type LvalueProjection<'tcx> = Projection<'tcx, Lvalue<'tcx>, Local, Ty<'tcx>
 /// and the index is a local.
 pub type LvalueElem<'tcx> = ProjectionElem<'tcx, Local, Ty<'tcx>>;
 
-newtype_index!(Field
-    {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "field"
-    });
+newtype_index!(Field { DEBUG_FORMAT = "field[{}]" });
 
 impl<'tcx> Lvalue<'tcx> {
     pub fn field(self, f: Field, ty: Ty<'tcx>) -> Lvalue<'tcx> {
@@ -1211,8 +1202,7 @@ impl<'tcx> Debug for Lvalue<'tcx> {
 
 newtype_index!(VisibilityScope
     {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "scope",
+        DEBUG_FORMAT = "scope[{}]",
         const ARGUMENT_VISIBILITY_SCOPE = 0,
     });
 
@@ -1539,11 +1529,7 @@ pub struct Constant<'tcx> {
     pub literal: Literal<'tcx>,
 }
 
-newtype_index!(Promoted
-    {
-        derive[RustcEncodable, RustcDecodable]
-        DEBUG_NAME = "promoted"
-    });
+newtype_index!(Promoted { DEBUG_FORMAT = "promoted[{}]" });
 
 
 #[derive(Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable)]