Rollup merge of #130880 - RalfJung:const-hack, r=scottmcm

workingjubilee · web-flow · commit 0aba6a5c9951 · 2024-09-26T13:57:31.000-07:00
add missing FIXME(const-hack)

r? ``@scottmcm``
diff --git a/library/core/src/ptr/alignment.rs b/library/core/src/ptr/alignment.rs
@@ -155,7 +155,7 @@ impl Alignment {
         !(unsafe { self.as_usize().unchecked_sub(1) })
     }
 
-    // Remove me once `Ord::max` is usable in const
+    // FIXME(const-hack) Remove me once `Ord::max` is usable in const
     pub(crate) const fn max(a: Self, b: Self) -> Self {
         if a.as_usize() > b.as_usize() { a } else { b }
     }

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ impl Alignment {`
`155`	`155`	`!(unsafe { self.as_usize().unchecked_sub(1) })`
`156`	`156`	`}`
`157`	`157`
`158`		- // Remove me once `Ord::max` is usable in const
	`158`	+ // FIXME(const-hack) Remove me once `Ord::max` is usable in const
`159`	`159`	`pub(crate) const fn max(a: Self, b: Self) -> Self {`
`160`	`160`	`if a.as_usize() > b.as_usize() { a } else { b }`
`161`	`161`	`}`