From 07e9426efba69e8b662f2a896326b157f5d0ba2d Mon Sep 17 00:00:00 2001 From: Camelid Date: Mon, 23 Nov 2020 19:26:15 -0800 Subject: [PATCH] Make `length_limit` a `usize` --- src/librustdoc/html/markdown.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 6bba5036191..0e4c5410abe 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -1043,13 +1043,11 @@ impl MarkdownSummaryLine<'_> { /// /// Returns a tuple of the rendered HTML string and whether the output was shortened /// due to the provided `length_limit`. -fn markdown_summary_with_limit(md: &str, length_limit: Option) -> (String, bool) { +fn markdown_summary_with_limit(md: &str, length_limit: usize) -> (String, bool) { if md.is_empty() { return (String::new(), false); } - let length_limit = length_limit.unwrap_or(u16::MAX) as usize; - let mut s = String::with_capacity(md.len() * 3 / 2); let mut text_length = 0; let mut stopped_early = false; @@ -1115,7 +1113,7 @@ fn markdown_summary_with_limit(md: &str, length_limit: Option) -> (String, /// /// See [`markdown_summary_with_limit`] for details about what is rendered and what is not. crate fn short_markdown_summary(markdown: &str) -> String { - let (mut s, was_shortened) = markdown_summary_with_limit(markdown, Some(59)); + let (mut s, was_shortened) = markdown_summary_with_limit(markdown, 59); if was_shortened { s.push('…');