diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-16 05:14:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-16 05:14:24 +0200 |
| commit | 426e747b7e64d6b1c1d3bf76a974f2d60e2552f3 (patch) | |
| tree | 8edd28f07018a9ce11451551ad87f2222787b075 /src/librustdoc/html | |
| parent | 9014cfcee4717c6309044bea1831eb4f35f4cb8a (diff) | |
| parent | 1c0e1c10d5c6463147690aba7696a7cbcf2840a1 (diff) | |
| download | rust-426e747b7e64d6b1c1d3bf76a974f2d60e2552f3.tar.gz rust-426e747b7e64d6b1c1d3bf76a974f2d60e2552f3.zip | |
Rollup merge of #59992 - QuietMisdreavus:static-settings-path, r=GuillaumeGomez
rustdoc: use --static-root-path for settings.js At the time i was writing https://github.com/rust-lang/docs.rs/pull/332, i noticed that the `settings.js` file that was being loaded was not being loaded from the `--static-root-path`. This PR fixes that so that users on docs.rs can effectively cache this file.
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 3ee131d8f5c..d91b78c8416 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -2113,7 +2113,8 @@ impl Context { &final_file); // Generating settings page. - let settings = Settings::new("./", &self.shared.resource_suffix); + let settings = Settings::new(self.shared.static_root_path.deref().unwrap_or("./"), + &self.shared.resource_suffix); page.title = "Rustdoc settings"; page.description = "Settings of Rustdoc"; page.root_path = "./"; |