From 68f32169e59dd8bde8fd66cc4ffe98cd24ac09ca Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Fri, 30 May 2025 13:26:36 +1000
Subject: Address review comments.

---
 src/librustdoc/html/format.rs              | 10 +++++-----
 src/librustdoc/html/render/write_shared.rs |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/librustdoc/html')

diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index c3107e24969..e9a7f4367a3 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -12,7 +12,7 @@ use std::fmt::{self, Display, Write};
 use std::iter::{self, once};
 use std::slice;
 
-use itertools::Either;
+use itertools::{Either, Itertools};
 use rustc_abi::ExternAbi;
 use rustc_attr_data_structures::{ConstStability, StabilityLevel, StableSince};
 use rustc_data_structures::fx::FxHashSet;
@@ -1118,8 +1118,8 @@ impl clean::Impl {
                     write!(f, "!")?;
                 }
                 if self.kind.is_fake_variadic()
-                    && let Some(mut generics) = ty.generics()
-                    && let (Some(inner_type), None) = (generics.next(), generics.next())
+                    && let Some(generics) = ty.generics()
+                    && let Ok(inner_type) = generics.exactly_one()
                 {
                     let last = ty.last();
                     if f.alternate() {
@@ -1197,8 +1197,8 @@ impl clean::Impl {
                 fmt_type(&bare_fn.decl.output, f, use_absolute, cx)?;
             }
         } else if let clean::Type::Path { path } = type_
-            && let Some(mut generics) = path.generics()
-            && let (Some(ty), None) = (generics.next(), generics.next())
+            && let Some(generics) = path.generics()
+            && let Ok(ty) = generics.exactly_one()
             && self.kind.is_fake_variadic()
         {
             let wrapper = print_anchor(path.def_id(), path.last(), cx);
diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs
index c1355750067..33738f7a242 100644
--- a/src/librustdoc/html/render/write_shared.rs
+++ b/src/librustdoc/html/render/write_shared.rs
@@ -653,7 +653,7 @@ impl TypeAliasPart {
                                 },
                             )
                             .to_string();
-                            // The alternate display disables html escaping of '<' and '>'.
+                            // The alternate display prints it as plaintext instead of HTML.
                             let trait_ = impl_
                                 .inner_impl()
                                 .trait_
-- 
cgit 1.4.1-3-g733a5