Auto merge of #132005 - matthiaskrgr:rollup-ced4upi, r=matthiaskrgr

Rollup of 7 pull requests
Successful merges:
- #130350 (stabilize Strict Provenance and Exposed Provenance APIs)
- #131737 (linkchecker: add a reminder on broken links to add new/renamed pages to `SUMMARY.md` for mdBooks)
- #131991 (test: Add test for trait in FQS cast, issue #98565)
- #131997 (Make `rustc_abi` compile on stable again)
- #131999 (Improve test coverage for `unit_bindings` lint)
- #132001 (fix coherence error for very large tuples™)
- #132003 (update ABI compatibility docs for new option-like rules)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

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);

compiler/rustc_arena/src/lib.rs

@@ -23,7 +23,6 @@
 #![feature(maybe_uninit_slice)]
 #![feature(rustc_attrs)]
 #![feature(rustdoc_internals)]
-#![feature(strict_provenance)]
 #![warn(unreachable_pub)]
 // tidy-alphabetical-end
 

compiler/rustc_codegen_ssa/src/lib.rs

@@ -11,7 +11,6 @@
 #![feature(let_chains)]
 #![feature(negative_impls)]
 #![feature(rustdoc_internals)]
-#![feature(strict_provenance)]
 #![feature(trait_alias)]
 #![feature(try_blocks)]
 #![warn(unreachable_pub)]

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

@@ -361,12 +361,16 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 (Int(..) | Float(_),Int(..) | Float(_)) => bx.bitcast(imm, to_backend_ty),
 (Pointer(..),Pointer(..)) => bx.pointercast(imm, to_backend_ty),
 (Int(..),Pointer(..)) => bx.ptradd(bx.const_null(bx.type_ptr()), imm),
-(Pointer(..),Int(..)) => bx.ptrtoint(imm, to_backend_ty),
+(Pointer(..),Int(..)) => {
+// FIXME: this exposes the provenance, which shouldn't be necessary.
+ bx.ptrtoint(imm, to_backend_ty)
+}
 (Float(_),Pointer(..)) => {
 let int_imm = bx.bitcast(imm, bx.cx().type_isize());
  bx.ptradd(bx.const_null(bx.type_ptr()), int_imm)
 }
 (Pointer(..),Float(_)) => {
+// FIXME: this exposes the provenance, which shouldn't be necessary.
 let int_imm = bx.ptrtoint(imm, bx.cx().type_isize());
  bx.bitcast(int_imm, to_backend_ty)
 }

compiler/rustc_const_eval/src/lib.rs

@@ -10,7 +10,6 @@
 #![feature(never_type)]
 #![feature(rustdoc_internals)]
 #![feature(slice_ptr_get)]
-#![feature(strict_provenance)]
 #![feature(trait_alias)]
 #![feature(try_blocks)]
 #![feature(unqualified_local_imports)]

compiler/rustc_data_structures/src/lib.rs

@@ -33,7 +33,6 @@
 #![feature(ptr_alignment_type)]
 #![feature(rustc_attrs)]
 #![feature(rustdoc_internals)]
-#![feature(strict_provenance)]
 #![feature(test)]
 #![feature(thread_id_value)]
 #![feature(type_alias_impl_trait)]

compiler/rustc_feature/src/unstable.rs

@@ -595,7 +595,7 @@ declare_features! (
 /// Allows attributes on expressions and non-item statements.
 (unstable, stmt_expr_attributes,"1.6.0",Some(15701)),
 /// Allows lints part of the strict provenance effort.
-(unstable,strict_provenance,"1.61.0",Some(95228)),
+(unstable,strict_provenance_lints,"1.61.0",Some(130351)),
 /// Allows string patterns to dereference values to match them.
 (unstable, string_deref_patterns,"1.67.0",Some(87121)),
 /// Allows the use of `#[target_feature]` on safe functions.

compiler/rustc_lint_defs/src/builtin.rs

@@ -2667,7 +2667,6 @@ declare_lint! {
 /// ### Example
 ///
 /// ```rust
-/// #![feature(strict_provenance)]
 /// #![warn(fuzzy_provenance_casts)]
 ///
 /// fn main() {
@@ -2701,7 +2700,7 @@ declare_lint! {
 pubFUZZY_PROVENANCE_CASTS,
 Allow,
 "a fuzzy integer to pointer cast is used",
- @feature_gate = strict_provenance;
+ @feature_gate = strict_provenance_lints;
 }
 
 declare_lint!{
@@ -2711,7 +2710,6 @@ declare_lint! {
 /// ### Example
 ///
 /// ```rust
-/// #![feature(strict_provenance)]
 /// #![warn(lossy_provenance_casts)]
 ///
 /// fn main() {
@@ -2747,7 +2745,7 @@ declare_lint! {
 pubLOSSY_PROVENANCE_CASTS,
 Allow,
 "a lossy pointer to integer cast is used",
- @feature_gate = strict_provenance;
+ @feature_gate = strict_provenance_lints;
 }
 
 declare_lint!{