diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2025-05-30 13:26:36 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2025-05-30 13:26:36 +1000 |
| commit | 68f32169e59dd8bde8fd66cc4ffe98cd24ac09ca (patch) | |
| tree | b1eb09b6fbad7b67f651a278e78491e1e67054f6 /src | |
| parent | 1f3d9a4b61d901850da6c3bc5bae3f630e230dfa (diff) | |
| download | rust-68f32169e59dd8bde8fd66cc4ffe98cd24ac09ca.tar.gz rust-68f32169e59dd8bde8fd66cc4ffe98cd24ac09ca.zip | |
Address review comments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/format.rs | 10 | ||||
| -rw-r--r-- | src/librustdoc/html/render/write_shared.rs | 2 |
2 files changed, 6 insertions, 6 deletions
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_ |
