diff options
| author | QuietMisdreavus <grey@quietmisdreavus.net> | 2019-04-15 11:20:08 -0500 |
|---|---|---|
| committer | QuietMisdreavus <grey@quietmisdreavus.net> | 2019-04-15 11:20:08 -0500 |
| commit | 1c0e1c10d5c6463147690aba7696a7cbcf2840a1 (patch) | |
| tree | 3b180c334a3ad88ff153e5aa476dc4c96ff030c9 | |
| parent | fcf850f34a4db4baa3ccda0e8e2e53eca5fc9936 (diff) | |
| download | rust-1c0e1c10d5c6463147690aba7696a7cbcf2840a1.tar.gz rust-1c0e1c10d5c6463147690aba7696a7cbcf2840a1.zip | |
use --static-root-path for settings.js
| -rw-r--r-- | src/librustdoc/html/render.rs | 3 | ||||
| -rw-r--r-- | src/test/rustdoc/static-root-path.rs | 4 |
2 files changed, 6 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 = "./"; diff --git a/src/test/rustdoc/static-root-path.rs b/src/test/rustdoc/static-root-path.rs index 84b32f90c89..2f7c89c5f1e 100644 --- a/src/test/rustdoc/static-root-path.rs +++ b/src/test/rustdoc/static-root-path.rs @@ -12,3 +12,7 @@ pub struct SomeStruct; // @!matches - '"\.\./\.\./source-script\.js"' // @matches - '"\.\./\.\./source-files.js"' // @!matches - '"/cache/source-files\.js"' + +// @has settings.html +// @matches - '/cache/settings\.js' +// @!matches - '\./settings\.js' |