diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-09-05 16:28:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-05 16:28:26 +0200 |
| commit | ed39e6d60a415f827aaca7fdbd571b309b1bb310 (patch) | |
| tree | d50ea79598797caa2451c2675f3f0322f2c5a871 /src/librustdoc/html/render | |
| parent | 86cf7976e2a81174a55aa9f77743764757f35597 (diff) | |
| parent | 18c14fde0d293a18fbd3c14487b52e1ce7daa205 (diff) | |
| download | rust-ed39e6d60a415f827aaca7fdbd571b309b1bb310.tar.gz rust-ed39e6d60a415f827aaca7fdbd571b309b1bb310.zip | |
Rollup merge of #76078 - jyn514:no-disambiguator, r=manishearth
Remove disambiguators from intra doc link text Closes https://github.com/rust-lang/rust/issues/65354. r? @Manishearth The commits are mostly atomic, but there might be some mix between them here and there. I recommend reading 'refactor ItemLink' and 'refactor RenderedLink' on their own though, lots of churn without any logic changes.
Diffstat (limited to 'src/librustdoc/html/render')
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 57b3b9502a3..f095f67b54c 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -63,9 +63,8 @@ use rustc_span::symbol::{sym, Symbol}; use serde::ser::SerializeSeq; use serde::{Serialize, Serializer}; -use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy, TypeKind}; -use crate::config::RenderInfo; -use crate::config::RenderOptions; +use crate::clean::{self, AttributesExt, Deprecation, GetDefId, RenderedLink, SelfTy, TypeKind}; +use crate::config::{RenderInfo, RenderOptions}; use crate::docfs::{DocFS, PathError}; use crate::doctree; use crate::error::Error; @@ -1774,7 +1773,7 @@ fn render_markdown( w: &mut Buffer, cx: &Context, md_text: &str, - links: Vec<(String, String)>, + links: Vec<RenderedLink>, prefix: &str, is_hidden: bool, ) { |
