diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-08-10 18:07:07 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-08-11 10:36:46 -0400 |
| commit | dbad77ffdd59e54b3f496cfbdb7909a6bbd03031 (patch) | |
| tree | 4c3e555d63d45547abb221ceca33ba345586bbd5 /src/librustdoc/externalfiles.rs | |
| parent | ade8b02828de9653e6aca122f1a0f6d8c48ad29b (diff) | |
| download | rust-dbad77ffdd59e54b3f496cfbdb7909a6bbd03031.tar.gz rust-dbad77ffdd59e54b3f496cfbdb7909a6bbd03031.zip | |
Remove thread-local for playground config
Diffstat (limited to 'src/librustdoc/externalfiles.rs')
| -rw-r--r-- | src/librustdoc/externalfiles.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustdoc/externalfiles.rs b/src/librustdoc/externalfiles.rs index d604ba11d41..d920b7c4c91 100644 --- a/src/librustdoc/externalfiles.rs +++ b/src/librustdoc/externalfiles.rs @@ -4,7 +4,7 @@ use std::str; use errors; use crate::syntax::feature_gate::UnstableFeatures; use crate::syntax::edition::Edition; -use crate::html::markdown::{IdMap, ErrorCodes, Markdown}; +use crate::html::markdown::{IdMap, ErrorCodes, Markdown, Playground}; use std::cell::RefCell; @@ -24,7 +24,7 @@ pub struct ExternalHtml { impl ExternalHtml { pub fn load(in_header: &[String], before_content: &[String], after_content: &[String], md_before_content: &[String], md_after_content: &[String], diag: &errors::Handler, - id_map: &mut IdMap, edition: Edition) + id_map: &mut IdMap, edition: Edition, playground: &Option<Playground>) -> Option<ExternalHtml> { let codes = ErrorCodes::from(UnstableFeatures::from_environment().is_nightly_build()); load_external_files(in_header, diag) @@ -36,7 +36,7 @@ impl ExternalHtml { load_external_files(md_before_content, diag) .map(|m_bc| (ih, format!("{}{}", bc, Markdown(&m_bc, &[], RefCell::new(id_map), - codes, edition)))) + codes, edition, playground)))) ) .and_then(|(ih, bc)| load_external_files(after_content, diag) @@ -46,7 +46,7 @@ impl ExternalHtml { load_external_files(md_after_content, diag) .map(|m_ac| (ih, bc, format!("{}{}", ac, Markdown(&m_ac, &[], RefCell::new(id_map), - codes, edition)))) + codes, edition, playground)))) ) .map(|(ih, bc, ac)| ExternalHtml { |
