bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustdoc: make bounds formatting lazy

Browse source
This commit is contained in:
Yotam Ofek 2025-02-10 16:20:26 +00:00
parent e4636e2613
commit 9436b4a75b
1 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/librustdoc/html/render/print_item.rs
View file

@ -1,6 +1,6 @@
use std::cmp::Ordering;
use std::fmt;
use std::fmt::{Display, Write};
use std::fmt::Display;
use itertools::Itertools;
use rinja::Template;
@ -27,7 +27,7 @@ use super::{
};
use crate::clean;
use crate::config::ModuleSorting;
use crate::display::Joined as _;
use crate::display::{Joined as _, MaybeDisplay as _};
use crate::formats::Impl;
use crate::formats::item_type::ItemType;
use crate::html::escape::{Escape, EscapeBodyTextWithWbr};
@ -2123,27 +2123,26 @@ pub(super) fn item_path(ty: ItemType, name: &str) -> String {
}
}
fn bounds(t_bounds: &[clean::GenericBound], trait_alias: bool, cx: &Context<'_>) -> String {
let mut bounds = String::new();
if t_bounds.is_empty() {
return bounds;
}
let has_lots_of_bounds = t_bounds.len() > 2;
let inter_str = if has_lots_of_bounds { "\n + " } else { " + " };
if !trait_alias {
if has_lots_of_bounds {
bounds.push_str(":\n ");
} else {
bounds.push_str(": ");
}
}
write!(
bounds,
"{}",
fmt::from_fn(|f| t_bounds.iter().map(|p| p.print(cx)).joined(inter_str, f))
)
.unwrap();
bounds
fn bounds<'a, 'tcx>(
bounds: &'a [clean::GenericBound],
trait_alias: bool,
cx: &'a Context<'tcx>,
) -> impl Display + 'a + Captures<'tcx> {
(!bounds.is_empty())
.then_some(fmt::from_fn(move |f| {
let has_lots_of_bounds = bounds.len() > 2;
let inter_str = if has_lots_of_bounds { "\n + " } else { " + " };
if !trait_alias {
if has_lots_of_bounds {
f.write_str(":\n ")?;
} else {
f.write_str(": ")?;
}
}
bounds.iter().map(|p| p.print(cx)).joined(inter_str, f)
}))
.maybe_display()
}
fn wrap_item<W, F>(w: &mut W, f: F)