Address more PR feedback

scottmcm · scottmcm · commit 1398fe7a5e91 · 2024-04-21T11:08:38.000-07:00
diff --git a/compiler/rustc_mir_transform/src/instsimplify.rs b/compiler/rustc_mir_transform/src/instsimplify.rs
@@ -121,7 +121,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
         if a.const_.ty().is_bool() { a.const_.try_to_bool() } else { None }
     }
 
-    /// Transform "&(*a)" ==> "a".
+    /// Transform `&(*a)` ==> `a`.
     fn simplify_ref_deref(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
         if let Rvalue::Ref(_, _, place) = rvalue {
             if let Some((base, ProjectionElem::Deref)) = place.as_ref().last_projection() {
@@ -141,7 +141,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
         }
     }
 
-    /// Transform "Len([_; N])" ==> "N".
+    /// Transform `Len([_; N])` ==> `N`.
     fn simplify_len(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
         if let Rvalue::Len(ref place) = *rvalue {
             let place_ty = place.ty(self.local_decls, self.tcx).ty;
@@ -157,7 +157,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {
         }
     }
 
-    /// Transform "Aggregate(RawPtr, \[p, ()\])" ==> "Cast(PtrToPtr, p)".
+    /// Transform `Aggregate(RawPtr, [p, ()])` ==> `Cast(PtrToPtr, p)`.
     fn simplify_ptr_aggregate(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {
         if let Rvalue::Aggregate(box AggregateKind::RawPtr(pointee_ty, mutability), fields) = rvalue
         {
diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs
@@ -2791,7 +2791,8 @@ pub unsafe fn vtable_align(_ptr: *const ()) -> usize {
 #[rustc_intrinsic_must_be_overridden]
 #[cfg(not(bootstrap))]
 pub const fn aggregate_raw_ptr<P: AggregateRawPtr<D, Metadata = M>, D, M>(_data: D, _meta: M) -> P {
-    // No fallback because `libcore` doesn't want to know the layout
+    // To implement a fallback we'd have to assume the layout of the pointer,
+    // but the whole point of this intrinsic is that we shouldn't do that.
     unreachable!()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {`
`121`	`121`	`if a.const_.ty().is_bool() { a.const_.try_to_bool() } else { None }`
`122`	`122`	`}`
`123`	`123`
`124`		`- /// Transform "&(*a)" ==> "a".`
	`124`	+ /// Transform `&(*a)` ==> `a`.
`125`	`125`	`fn simplify_ref_deref(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {`
`126`	`126`	`if let Rvalue::Ref(_, _, place) = rvalue {`
`127`	`127`	`if let Some((base, ProjectionElem::Deref)) = place.as_ref().last_projection() {`
`@@ -141,7 +141,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`- /// Transform "Len([_; N])" ==> "N".`
	`144`	+ /// Transform `Len([_; N])` ==> `N`.
`145`	`145`	`fn simplify_len(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {`
`146`	`146`	`if let Rvalue::Len(ref place) = *rvalue {`
`147`	`147`	`let place_ty = place.ty(self.local_decls, self.tcx).ty;`
`@@ -157,7 +157,7 @@ impl<'tcx> InstSimplifyContext<'tcx, '_> {`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`- /// Transform "Aggregate(RawPtr, \[p, ()\])" ==> "Cast(PtrToPtr, p)".`
	`160`	+ /// Transform `Aggregate(RawPtr, [p, ()])` ==> `Cast(PtrToPtr, p)`.
`161`	`161`	`fn simplify_ptr_aggregate(&self, source_info: &SourceInfo, rvalue: &mut Rvalue<'tcx>) {`
`162`	`162`	`if let Rvalue::Aggregate(box AggregateKind::RawPtr(pointee_ty, mutability), fields) = rvalue`
`163`	`163`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2791,7 +2791,8 @@ pub unsafe fn vtable_align(_ptr: *const ()) -> usize {`
`2791`	`2791`	`#[rustc_intrinsic_must_be_overridden]`
`2792`	`2792`	`#[cfg(not(bootstrap))]`
`2793`	`2793`	`pub const fn aggregate_raw_ptr<P: AggregateRawPtr<D, Metadata = M>, D, M>(_data: D, _meta: M) -> P {`
`2794`		- // No fallback because `libcore` doesn't want to know the layout
	`2794`	`+ // To implement a fallback we'd have to assume the layout of the pointer,`
	`2795`	`+ // but the whole point of this intrinsic is that we shouldn't do that.`
`2795`	`2796`	`unreachable!()`
`2796`	`2797`	`}`
`2797`	`2798`