rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove global derive_id and reset_ids functions

Browse Source 
Previously these functions relied on TLS but we can instead thread the
relevant state through explicitly.
This commit is contained in:
Mark Rousskov
2018-07-22 07:25:00 -06:00
parent 2216db9de7
commit 7bea518d3a
6 changed files with 190 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustdoc/lib.rs
View File

@@ -500,12 +500,14 @@ fn main_args(args: &[String]) -> isize {
}
}
let mut id_map = html::markdown::IdMap::new();
id_map.populate(html::render::initial_ids());
let external_html = match ExternalHtml::load(
&matches.opt_strs("html-in-header"),
&matches.opt_strs("html-before-content"),
&matches.opt_strs("html-after-content"),
&matches.opt_strs("markdown-before-content"),
&matches.opt_strs("markdown-after-content"), &diag) {
&matches.opt_strs("markdown-after-content"), &diag, &mut id_map) {
Some(eh) => eh,
None => return 3,
};
@@ -562,7 +564,7 @@ fn main_args(args: &[String]) -> isize {
renderinfo,
sort_modules_alphabetically,
themes,
enable_minification)
enable_minification, id_map)
.expect("failed to generate documentation");
0
}