Commit 45b80ac

committed

Auto merge of #142869 - nnethercote:join_path-mini, r=camelid

Use `join_with_double_colon` in `write_shared.rs`. For consistency. Also, it's faster because `join_with_double_colon` does a better job estimating the allocation size than `join` from `itertools`. r? `@camelid`

2 parents 2783fc4 + 0cf0f9f commit 45b80acCopy full SHA for 45b80ac

File tree

1 file changed

-2

lines changed

src/librustdoc/html/render
- write_shared.rs

1 file changed

-2

lines changed

`‎src/librustdoc/html/render/write_shared.rs`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ use std::str::FromStr;`
`25`	`25`	`use std::{fmt, fs};`
`26`	`26`
`27`	`27`	`use indexmap::IndexMap;`
`28`		`-use itertools::Itertools;`
`29`	`28`	`use regex::Regex;`
`30`	`29`	`use rustc_data_structures::flock;`
`31`	`30`	`use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};`
`@@ -44,6 +43,7 @@ use crate::docfs::PathError;`
`44`	`43`	`use crate::error::Error;`
`45`	`44`	`use crate::formats::Impl;`
`46`	`45`	`use crate::formats::item_type::ItemType;`
	`46`	`+use crate::html::format::join_with_double_colon;`
`47`	`47`	`use crate::html::layout;`
`48`	`48`	`use crate::html::render::ordered_json::{EscapedJson, OrderedJson};`
`49`	`49`	`use crate::html::render::search_index::{SerializedSearchIndex, build_index};`
`@@ -608,7 +608,7 @@ impl TypeAliasPart {`
`608`	`608`	`for &(type_alias_fqp, type_alias_item) in type_aliases {`
`609`	`609`	`cx.id_map.borrow_mut().clear();`
`610`	`610`	`cx.deref_id_map.borrow_mut().clear();`
`611`		`- let type_alias_fqp = (*type_alias_fqp).iter().join("::");`
	`611`	`+ let type_alias_fqp = join_with_double_colon(&type_alias_fqp);`
`612`	`612`	`if let Some(ret) = &mut ret {`
`613`	`613`	`ret.aliases.push(type_alias_fqp);`
`614`	`614`	`} else {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 45b80ac

File tree

1 file changed

1 file changed

`‎src/librustdoc/html/render/write_shared.rs`

0 commit comments