From e2773733f35f71dba92588d6b29e43d2cc035a34 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 11 Mar 2024 18:39:23 +0000
Subject: [PATCH] Some comment nits

---
 compiler/rustc_codegen_gcc/src/mono_item.rs  | 2 +-
 compiler/rustc_codegen_llvm/src/consts.rs    | 5 ++---
 compiler/rustc_codegen_llvm/src/mono_item.rs | 2 +-
 compiler/rustc_hir/src/def.rs                | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler/rustc_codegen_gcc/src/mono_item.rs b/compiler/rustc_codegen_gcc/src/mono_item.rs
index ceaf87d16481..359d3c70b4ca 100644
--- a/compiler/rustc_codegen_gcc/src/mono_item.rs
+++ b/compiler/rustc_codegen_gcc/src/mono_item.rs
@@ -26,7 +26,7 @@ impl<'gcc, 'tcx> PreDefineMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
         let attrs = self.tcx.codegen_fn_attrs(def_id);
         let instance = Instance::mono(self.tcx, def_id);
         let DefKind::Static { nested, .. } = self.tcx.def_kind(def_id) else { bug!() };
-        // Nested statics do not have a type, so pick a random type and let `define_static` figure out
+        // Nested statics do not have a type, so pick a dummy type and let `codegen_static` figure out
         // the gcc type from the actual evaluated initializer.
         let ty = if nested {
             self.tcx.types.unit
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs
index 8e047f124eeb..4afa230e598b 100644
--- a/compiler/rustc_codegen_llvm/src/consts.rs
+++ b/compiler/rustc_codegen_llvm/src/consts.rs
@@ -232,7 +232,7 @@ impl<'ll> CodegenCx<'ll, '_> {
         trace!(?instance);
 
         let DefKind::Static { nested, .. } = self.tcx.def_kind(def_id) else { bug!() };
-        // Nested statics do not have a type, so pick a random type and let `define_static` figure out
+        // Nested statics do not have a type, so pick a dummy type and let `codegen_static` figure out
         // the llvm type from the actual evaluated initializer.
         let llty = if nested {
             self.type_i8()
@@ -415,8 +415,7 @@ impl<'ll> CodegenCx<'ll, '_> {
                 llvm::LLVMRustSetDSOLocal(g, true);
             }
 
-            // As an optimization, all shared statics which do not have interior
-            // mutability are placed into read-only memory.
+            // Forward the allocation's mutability (picked by the const interner) to LLVM.
             if alloc.mutability.is_not() {
                 llvm::LLVMSetGlobalConstant(g, llvm::True);
             }
diff --git a/compiler/rustc_codegen_llvm/src/mono_item.rs b/compiler/rustc_codegen_llvm/src/mono_item.rs
index 81ac95718858..29100a641712 100644
--- a/compiler/rustc_codegen_llvm/src/mono_item.rs
+++ b/compiler/rustc_codegen_llvm/src/mono_item.rs
@@ -24,7 +24,7 @@ impl<'tcx> PreDefineMethods<'tcx> for CodegenCx<'_, 'tcx> {
     ) {
         let instance = Instance::mono(self.tcx, def_id);
         let DefKind::Static { nested, .. } = self.tcx.def_kind(def_id) else { bug!() };
-        // Nested statics do not have a type, so pick a random type and let `define_static` figure out
+        // Nested statics do not have a type, so pick a dummy type and let `codegen_static` figure out
         // the llvm type from the actual evaluated initializer.
         let ty = if nested {
             self.tcx.types.unit
diff --git a/compiler/rustc_hir/src/def.rs b/compiler/rustc_hir/src/def.rs
index f6a616109c97..1810193c16bd 100644
--- a/compiler/rustc_hir/src/def.rs
+++ b/compiler/rustc_hir/src/def.rs
@@ -251,7 +251,7 @@ impl DefKind {
             | DefKind::TyParam
             | DefKind::ExternCrate => DefPathData::TypeNs(name),
             // It's not exactly an anon const, but wrt DefPathData, there
-            // is not difference.
+            // is no difference.
             DefKind::Static { nested: true, .. } => DefPathData::AnonConst,
             DefKind::Fn
             | DefKind::Const