diff --git a/compiler/rustc_ast_pretty/src/pprust/state/expr.rs b/compiler/rustc_ast_pretty/src/pprust/state/expr.rs
index d31332b3b91db..aeb0c76202041 100644
--- a/compiler/rustc_ast_pretty/src/pprust/state/expr.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/state/expr.rs
@@ -558,14 +558,13 @@ impl<'a> State<'a> {
                 self.word(",");
                 self.space();
 
-                let (&first, rest) =
-                    fields.split_first().expect("offset_of! should have at least 1 field");
+                if let Some((&first, rest)) = fields.split_first() {
+                    self.print_ident(first);
 
-                self.print_ident(first);
-
-                for &field in rest {
-                    self.word(".");
-                    self.print_ident(field);
+                    for &field in rest {
+                        self.word(".");
+                        self.print_ident(field);
+                    }
                 }
 
                 self.end();
diff --git a/compiler/rustc_const_eval/src/interpret/step.rs b/compiler/rustc_const_eval/src/interpret/step.rs
index 4ed83f1db0e96..4d3a11935085d 100644
--- a/compiler/rustc_const_eval/src/interpret/step.rs
+++ b/compiler/rustc_const_eval/src/interpret/step.rs
@@ -287,7 +287,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     // FIXME: This should be a span_bug (#80742)
                     self.tcx.sess.delay_span_bug(
                         self.frame().current_span(),
-                        &format!("Nullary MIR operator called for unsized type {}", ty),
+                        &format!("{null_op:?} MIR operator called for unsized type {ty}"),
                     );
                     throw_inval!(SizeOfUnsizedType(ty));
                 }
diff --git a/compiler/rustc_hir_pretty/src/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
index 1e05003c19ce0..2db4f1e50d48e 100644
--- a/compiler/rustc_hir_pretty/src/lib.rs
+++ b/compiler/rustc_hir_pretty/src/lib.rs
@@ -1557,14 +1557,13 @@ impl<'a> State<'a> {
                 self.word(",");
                 self.space();
 
-                let (&first, rest) =
-                    fields.split_first().expect("offset_of! should have at least 1 field");
+                if let Some((&first, rest)) = fields.split_first() {
+                    self.print_ident(first);
 
-                self.print_ident(first);
-
-                for &field in rest {
-                    self.word(".");
-                    self.print_ident(field);
+                    for &field in rest {
+                        self.word(".");
+                        self.print_ident(field);
+                    }
                 }
 
                 self.word(")");
diff --git a/compiler/rustc_hir_typeck/src/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
index 653f2f2886f79..3ffc583d43f61 100644
--- a/compiler/rustc_hir_typeck/src/expr.rs
+++ b/compiler/rustc_hir_typeck/src/expr.rs
@@ -3084,6 +3084,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     {
                         let field_ty = self.field_ty(expr.span, field, substs);
 
+                        // FIXME: DSTs with static alignment should be allowed
                         self.require_type_is_sized(field_ty, expr.span, traits::MiscObligation);
 
                         if field.vis.is_accessible_from(def_scope, self.tcx) {
diff --git a/compiler/rustc_mir_build/src/build/expr/category.rs b/compiler/rustc_mir_build/src/build/expr/category.rs
index 3cc104ad96ac3..d9aa461c19d40 100644
--- a/compiler/rustc_mir_build/src/build/expr/category.rs
+++ b/compiler/rustc_mir_build/src/build/expr/category.rs
@@ -53,7 +53,8 @@ impl Category {
             | ExprKind::Borrow { .. }
             | ExprKind::AddressOf { .. }
             | ExprKind::Yield { .. }
-            | ExprKind::Call { .. } => Some(Category::Rvalue(RvalueFunc::Into)),
+            | ExprKind::Call { .. }
+            | ExprKind::InlineAsm { .. } => Some(Category::Rvalue(RvalueFunc::Into)),
 
             ExprKind::Array { .. }
             | ExprKind::Tuple { .. }
@@ -67,7 +68,6 @@ impl Category {
             | ExprKind::Assign { .. }
             | ExprKind::AssignOp { .. }
             | ExprKind::ThreadLocalRef(_)
-            | ExprKind::InlineAsm { .. }
             | ExprKind::OffsetOf { .. } => Some(Category::Rvalue(RvalueFunc::AsRvalue)),
 
             ExprKind::ConstBlock { .. }
diff --git a/compiler/rustc_mir_build/src/thir/print.rs b/compiler/rustc_mir_build/src/thir/print.rs
index 86d20327f60f5..9fec3ce16ee90 100644
--- a/compiler/rustc_mir_build/src/thir/print.rs
+++ b/compiler/rustc_mir_build/src/thir/print.rs
@@ -520,7 +520,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
                 print_indented!(self, "}", depth_lvl);
             }
             OffsetOf { container, fields } => {
-                print_indented!(self, "InlineAsm {", depth_lvl);
+                print_indented!(self, "OffsetOf {", depth_lvl);
                 print_indented!(self, format!("container: {:?}", container), depth_lvl + 1);
                 print_indented!(self, "fields: [", depth_lvl + 1);
 
diff --git a/library/core/src/mem/mod.rs b/library/core/src/mem/mod.rs
index 85745334e9ff7..7d2f297152365 100644
--- a/library/core/src/mem/mod.rs
+++ b/library/core/src/mem/mod.rs
@@ -1319,5 +1319,5 @@ impl<T> SizedTypeProperties for T {}
 #[rustc_builtin_macro]
 #[cfg(not(bootstrap))]
 pub macro offset_of($Container:ty, $($fields:tt).+ $(,)?) {
-    // ...implementation defined...
+    /* compiler built-in */
 }
diff --git a/src/tools/rustfmt/src/expr.rs b/src/tools/rustfmt/src/expr.rs
index b76e3a2a87c99..a0882eff707f2 100644
--- a/src/tools/rustfmt/src/expr.rs
+++ b/src/tools/rustfmt/src/expr.rs
@@ -345,7 +345,6 @@ pub(crate) fn format_expr(
         // Style Guide RFC for InlineAsm variant pending
         // https://github.com/rust-dev-tools/fmt-rfcs/issues/152
         ast::ExprKind::InlineAsm(..) => Some(context.snippet(expr.span).to_owned()),
-        ast::ExprKind::OffsetOf(..) => Some(context.snippet(expr.span).to_owned()),
         ast::ExprKind::TryBlock(ref block) => {
             if let rw @ Some(_) =
                 rewrite_single_line_block(context, "try ", block, Some(&expr.attrs), None, shape)
@@ -400,7 +399,7 @@ pub(crate) fn format_expr(
             }
         }
         ast::ExprKind::Underscore => Some("_".to_owned()),
-        ast::ExprKind::FormatArgs(..) | ast::ExprKind::IncludedBytes(..) => {
+        ast::ExprKind::FormatArgs(..) | ast::ExprKind::IncludedBytes(..) | ast::ExprKind::OffsetOf(..) => {
             // These do not occur in the AST because macros aren't expanded.
             unreachable!()
         }