switch back to using a plain `u32`, not `NonZeroU32`

This reverts (part of) commit cb9a336ae2cf6a75fdcc130853286349cb424c96.

diff --git a/src/librustc_data_structures/indexed_vec.rs b/src/librustc_data_structures/indexed_vec.rs
index 9240eaec3b4b5493e8da221393eaea70aff277a1..31dba2c2cdfbe0a2e381cdad9e41ae89889035a7 100644 (file)
--- a/src/librustc_data_structures/indexed_vec.rs
+++ b/src/librustc_data_structures/indexed_vec.rs
@@ -98,7 +98,7 @@ macro_rules! newtype_index {
      @debug_format [$debug_format:tt]) => (
         #[derive(Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, $($derives),*)]
         $v struct $type {
-            private: ::std::num::NonZeroU32
+            private: u32
         }
 
         impl $type {
@@ -142,7 +142,7 @@ impl $type {
 
             #[inline]
             $v const unsafe fn from_u32_unchecked(value: u32) -> Self {
-                $type { private: ::std::num::NonZeroU32::new_unchecked(value + 1) }
+                $type { private: value }
             }
 
             /// Extract value of this index as an integer.
@@ -153,13 +153,13 @@ impl $type {
 
             /// Extract value of this index as a usize.
             #[inline]
-            $v fn as_u32(self) -> u32 {
-                self.private.get() - 1
+            $v const fn as_u32(self) -> u32 {
+                self.private
             }
 
             /// Extract value of this index as a u32.
             #[inline]
-            $v fn as_usize(self) -> usize {
+            $v const fn as_usize(self) -> usize {
                 self.as_u32() as usize
             }
         }