fix stage 2

Author: oli-obk

compiler/rustc_ast/src/lib.rs

@@ -18,6 +18,7 @@
 #![feature(negative_impls)]
 #![feature(slice_internals)]
 #![feature(stmt_expr_attributes)]
+#![feature(structural_match)]
 #![recursion_limit = "256"]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]

compiler/rustc_borrowck/src/lib.rs

@@ -8,6 +8,7 @@
 #![feature(once_cell)]
 #![feature(rustc_attrs)]
 #![feature(stmt_expr_attributes)]
+#![feature(structural_match)]
 #![feature(trusted_step)]
 #![feature(try_blocks)]
 #![recursion_limit = "256"]

compiler/rustc_data_structures/src/lib.rs

@@ -17,6 +17,7 @@
 #![feature(maybe_uninit_uninit_array)]
 #![feature(min_specialization)]
 #![feature(never_type)]
+#![feature(structural_match)]
 #![feature(type_alias_impl_trait)]
 #![feature(new_uninit)]
 #![feature(once_cell)]

compiler/rustc_hir/src/lib.rs

@@ -9,6 +9,7 @@
 #![feature(min_specialization)]
 #![feature(never_type)]
 #![feature(rustc_attrs)]
+#![feature(structural_match)]
 #![feature(variant_count)]
 #![recursion_limit = "256"]
 #![deny(rustc::untranslatable_diagnostic)]

compiler/rustc_hir_analysis/src/lib.rs

@@ -69,6 +69,7 @@ This API is completely unstable and subject to change.
 #![feature(never_type)]
 #![feature(once_cell)]
 #![feature(slice_partition_dedup)]
+#![feature(structural_match)]
 #![feature(try_blocks)]
 #![feature(is_some_and)]
 #![feature(type_alias_impl_trait)]

compiler/rustc_hir_typeck/src/lib.rs

@@ -5,6 +5,7 @@
 #![feature(min_specialization)]
 #![feature(control_flow_enum)]
 #![feature(drain_filter)]
+#![feature(structural_match)]
 #![allow(rustc::potential_query_instability)]
 #![recursion_limit = "256"]
 

compiler/rustc_index/src/lib.rs

@@ -9,6 +9,7 @@
         new_uninit,
         step_trait,
         stmt_expr_attributes,
+        structural_match,
         test
     )
 )]

compiler/rustc_infer/src/lib.rs

@@ -20,6 +20,7 @@
 #![feature(if_let_guard)]
 #![feature(min_specialization)]
 #![feature(never_type)]
+#![feature(structural_match)]
 #![feature(try_blocks)]
 #![recursion_limit = "512"] // For rustdoc
 

compiler/rustc_lint/src/lib.rs

@@ -37,6 +37,7 @@
 #![feature(min_specialization)]
 #![feature(never_type)]
 #![feature(rustc_attrs)]
+#![feature(structural_match)]
 #![recursion_limit = "256"]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]

compiler/rustc_macros/src/newtype.rs

@@ -93,7 +93,7 @@ impl Parse for Newtype {
                 }
                 impl<E: ::rustc_serialize::Encoder> ::rustc_serialize::Encodable<E> for #name {
                     fn encode(&self, e: &mut E) {
-                        e.emit_u32(self.private);
+                        e.emit_u32(self.as_u32());
                     }
                 }
             }
@@ -103,11 +103,16 @@ impl Parse for Newtype {
 
         if ord {
             derive_paths.push(parse_quote!(Ord));
-            derive_paths.push(parse_quote!(PartialOrd));
         }
 
         let step = if ord {
             quote! {
+                impl ::std::cmp::PartialOrd for #name {
+                    fn partial_cmp(&self, other: &Self) -> Option<::std::cmp::Ordering> {
+                        self.as_u32().partial_cmp(&other.as_u32())
+                    }
+                }
+
                 impl ::std::iter::Step for #name {
                     #[inline]
                     fn steps_between(start: &Self, end: &Self) -> Option<usize> {
@@ -150,7 +155,7 @@ impl Parse for Newtype {
                         #[inline]
                         fn eq(l: &Option<Self>, r: &Option<Self>) -> bool {
                             if #max_val < u32::MAX {
-                                l.map(|i| i.private).unwrap_or(#max_val+1) == r.map(|i| i.private).unwrap_or(#max_val+1)
+                                l.map(|i| i.as_u32()).unwrap_or(#max_val+1) == r.map(|i| i.as_u32()).unwrap_or(#max_val+1)
                             } else {
                                 match (l, r) {
                                     (Some(l), Some(r)) => r == l,
@@ -170,13 +175,21 @@ impl Parse for Newtype {
 
         Ok(Self(quote! {
             #(#attrs)*
-            #[derive(Clone, Copy, PartialEq, Eq, Hash, #(#derive_paths),*)]
+            #[derive(Clone, Copy, Eq, Hash, #(#derive_paths),*)]
             #[rustc_layout_scalar_valid_range_end(#max)]
             #[rustc_pass_by_value]
             #vis struct #name {
                 private: u32,
             }
 
+            impl ::std::cmp::PartialEq for #name {
+                fn eq(&self, other: &Self) -> bool {
+                    self.as_u32() == other.as_u32()
+                }
+            }
+
+            impl ::std::marker::StructuralPartialEq for #name {}
+
             #(#consts)*
 
             impl #name {
@@ -224,7 +237,7 @@ impl Parse for Newtype {
                 /// Prefer using `from_u32`.
                 #[inline]
                 #vis const unsafe fn from_u32_unchecked(value: u32) -> Self {
-                    Self { private: value }
+                    Self { private: value as _ }
                 }
 
                 /// Extracts the value of this index as a `usize`.
@@ -236,7 +249,7 @@ impl Parse for Newtype {
                 /// Extracts the value of this index as a `u32`.
                 #[inline]
                 #vis const fn as_u32(self) -> u32 {
-                    self.private
+                    self.private as u32
                 }
 
                 /// Extracts the value of this index as a `usize`.

compiler/rustc_middle/src/lib.rs

@@ -45,6 +45,7 @@
 #![feature(type_alias_impl_trait)]
 #![feature(associated_type_bounds)]
 #![feature(rustc_attrs)]
+#![feature(structural_match)]
 #![feature(control_flow_enum)]
 #![feature(associated_type_defaults)]
 #![feature(trusted_step)]

compiler/rustc_mir_build/src/lib.rs

@@ -10,6 +10,7 @@
 #![feature(min_specialization)]
 #![feature(once_cell)]
 #![feature(try_blocks)]
+#![feature(structural_match)]
 #![recursion_limit = "256"]
 
 #[macro_use]

compiler/rustc_mir_dataflow/src/lib.rs

@@ -3,6 +3,7 @@
 #![feature(exact_size_is_empty)]
 #![feature(min_specialization)]
 #![feature(once_cell)]
+#![feature(structural_match)]
 #![feature(stmt_expr_attributes)]
 #![feature(trusted_step)]
 #![recursion_limit = "256"]

compiler/rustc_mir_transform/src/lib.rs

@@ -7,6 +7,7 @@
 #![feature(never_type)]
 #![feature(once_cell)]
 #![feature(option_get_or_insert_default)]
+#![feature(structural_match)]
 #![feature(trusted_step)]
 #![feature(try_blocks)]
 #![feature(yeet_expr)]

compiler/rustc_passes/src/lib.rs

@@ -10,6 +10,7 @@
 #![feature(let_chains)]
 #![feature(map_try_insert)]
 #![feature(min_specialization)]
+#![feature(structural_match)]
 #![feature(try_blocks)]
 #![recursion_limit = "256"]
 

compiler/rustc_query_system/src/lib.rs

@@ -3,6 +3,7 @@
 #![feature(hash_raw_entry)]
 #![feature(min_specialization)]
 #![feature(extern_types)]
+#![feature(structural_match)]
 #![allow(rustc::potential_query_instability)]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]

compiler/rustc_span/src/lib.rs

@@ -19,6 +19,7 @@
 #![feature(negative_impls)]
 #![feature(min_specialization)]
 #![feature(rustc_attrs)]
+#![feature(structural_match)]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]
 

compiler/rustc_target/src/lib.rs

@@ -15,6 +15,7 @@
 #![feature(never_type)]
 #![feature(rustc_attrs)]
 #![feature(step_trait)]
+#![feature(structural_match)]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]
 

compiler/rustc_trait_selection/src/lib.rs

@@ -20,6 +20,7 @@
 #![feature(if_let_guard)]
 #![feature(never_type)]
 #![feature(result_option_inspect)]
+#![feature(structural_match)]
 #![feature(type_alias_impl_trait)]
 #![feature(min_specialization)]
 #![recursion_limit = "512"] // For rustdoc

compiler/rustc_type_ir/src/lib.rs

@@ -1,6 +1,7 @@
 #![feature(fmt_helpers_for_derive)]
 #![feature(min_specialization)]
 #![feature(rustc_attrs)]
+#![feature(structural_match)]
 #![deny(rustc::untranslatable_diagnostic)]
 #![deny(rustc::diagnostic_outside_of_impl)]
 
@@ -818,20 +819,20 @@ impl UniverseIndex {
     /// name the region `'a`, but that region was not nameable from
     /// `U` because it was not in scope there.
     pub fn next_universe(self) -> UniverseIndex {
-        UniverseIndex::from_u32(self.private.checked_add(1).unwrap())
+        UniverseIndex::from_u32(self.as_u32().checked_add(1).unwrap())
     }
 
     /// Returns `true` if `self` can name a name from `other` -- in other words,
     /// if the set of names in `self` is a superset of those in
     /// `other` (`self >= other`).
     pub fn can_name(self, other: UniverseIndex) -> bool {
-        self.private >= other.private
+        self.as_u32() >= other.as_u32()
     }
 
     /// Returns `true` if `self` cannot name some names from `other` -- in other
     /// words, if the set of names in `self` is a strict subset of
     /// those in `other` (`self < other`).
     pub fn cannot_name(self, other: UniverseIndex) -> bool {
-        self.private < other.private
+        self.as_u32() < other.as_u32()
     }
 }