Rollup merge of #131997 - Veykril:veykril/push-upvqkyxmvkzw, r=jieyouxu

Make `rustc_abi` compile on stable again
#131473 accidentally broke this

Author: matthiaskrgr

compiler/rustc_abi/src/callconv.rs

@@ -3,18 +3,23 @@ mod abi {
 pub(crate)usecrate::Variants;
 }
 
+#[cfg(feature = "nightly")]
 use rustc_macros::HashStable_Generic;
 
-usecrate::{Abi,Align,FieldsShape,HasDataLayout,Size,TyAbiInterface,TyAndLayout};
+#[cfg(feature = "nightly")]
+usecrate::{Abi,FieldsShape,TyAbiInterface,TyAndLayout};
+usecrate::{Align,HasDataLayout,Size};
 
-#[derive(Copy,Clone,PartialEq,Eq,Hash,Debug,HashStable_Generic)]
+#[cfg_attr(feature = "nightly", derive(HashStable_Generic))]
+#[derive(Copy,Clone,PartialEq,Eq,Hash,Debug)]
 pubenumRegKind{
 Integer,
 Float,
 Vector,
 }
 
-#[derive(Copy,Clone,PartialEq,Eq,Hash,Debug,HashStable_Generic)]
+#[cfg_attr(feature = "nightly", derive(HashStable_Generic))]
+#[derive(Copy,Clone,PartialEq,Eq,Hash,Debug)]
 pubstructReg{
 pubkind:RegKind,
 pubsize:Size,
@@ -108,15 +113,8 @@ impl HomogeneousAggregate {
 }
 }
 
+#[cfg(feature = "nightly")]
 impl<'a,Ty>TyAndLayout<'a,Ty>{
-/// Returns `true` if this is an aggregate type (including a ScalarPair!)
-pubfnis_aggregate(&self) -> bool{
-matchself.abi{
-Abi::Uninhabited | Abi::Scalar(_) | Abi::Vector{ .. } => false,
-Abi::ScalarPair(..) | Abi::Aggregate{ .. } => true,
-}
-}
-
 /// Returns `Homogeneous` if this layout is an aggregate containing fields of
 /// only a single type (e.g., `(u32, u32)`). Such aggregates are often
 /// special-cased in ABIs.

compiler/rustc_abi/src/layout.rs

@@ -11,8 +11,10 @@ use crate::{
 Variants,WrappingRange,
 };
 
+#[cfg(feature = "nightly")]
 mod ty;
 
+#[cfg(feature = "nightly")]
 pubuse ty::{FIRST_VARIANT,FieldIdx,Layout,TyAbiInterface,TyAndLayout,VariantIdx};
 
 // A variant is absent if it's uninhabited and only has ZST fields.

compiler/rustc_abi/src/lib.rs

@@ -29,14 +29,14 @@ mod layout;
 mod tests;
 
 pubuse callconv::{Heterogeneous,HomogeneousAggregate,Reg,RegKind};
-pubuse layout::{
-FIRST_VARIANT,FieldIdx,Layout,LayoutCalculator,LayoutCalculatorError,TyAbiInterface,
-TyAndLayout,VariantIdx,
-};
+#[cfg(feature = "nightly")]
+pubuse layout::{FIRST_VARIANT,FieldIdx,Layout,TyAbiInterface,TyAndLayout,VariantIdx};
+pubuse layout::{LayoutCalculator,LayoutCalculatorError};
 
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro
 /// instead of implementing everything in `rustc_middle`.
+#[cfg(feature = "nightly")]
 pubtraitHashStableContext{}
 
 #[derive(Clone,Copy,PartialEq,Eq,Default)]
@@ -1644,6 +1644,14 @@ pub struct LayoutS<FieldIdx: Idx, VariantIdx: Idx> {
 }
 
 impl<FieldIdx:Idx,VariantIdx:Idx>LayoutS<FieldIdx,VariantIdx>{
+/// Returns `true` if this is an aggregate type (including a ScalarPair!)
+pubfnis_aggregate(&self) -> bool{
+matchself.abi{
+Abi::Uninhabited | Abi::Scalar(_) | Abi::Vector{ .. } => false,
+Abi::ScalarPair(..) | Abi::Aggregate{ .. } => true,
+}
+}
+
 pubfnscalar<C:HasDataLayout>(cx:&C,scalar:Scalar) -> Self{
 let largest_niche = Niche::from_scalar(cx,Size::ZERO, scalar);
 let size = scalar.size(cx);

tests/run-make/rustc-crates-on-stable/rmake.rs

@@ -31,6 +31,10 @@ fn main() {
 "rustc_pattern_analysis",
 "-p",
 "rustc_lexer",
+"-p",
+"rustc_abi",
+"-p",
+"rustc_parse_format",
 ])
 .run();
 }