Rename rustdoc raw content options to "additional"

GuillaumeGomez · GuillaumeGomez · commit c0b54dc1f575 · 2019-03-05T17:59:13.000+01:00
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
@@ -360,8 +360,8 @@ fn invoke_rustdoc(builder: &Builder, compiler: Compiler, target: Interned<String
     cmd.arg("--html-after-content").arg(&footer)
        .arg("--html-before-content").arg(&version_info)
        .arg("--html-in-header").arg(&favicon)
-       .arg("--raw-js-in-header").arg(&generate_jump_version_js(&jump_version_js))
-       .arg("--raw-css-in-header").arg(&generate_jump_version_css(&jump_version_css))
+       .arg("--additional-js").arg(&generate_jump_version_js(&jump_version_js))
+       .arg("--additional-css").arg(&generate_jump_version_css(&jump_version_css))
        .arg("--markdown-no-toc")
        .arg("--markdown-playground-url").arg("https://play.rust-lang.org/")
        .arg("-o").arg(&out)
@@ -449,9 +449,9 @@ impl Step for Standalone {
             cmd.arg("--html-after-content").arg(&footer)
                .arg("--html-before-content").arg(&version_info)
                .arg("--html-in-header").arg(&favicon)
-               .arg("--raw-js-in-header")
+               .arg("--additional-js")
                .arg(&generate_jump_version_js(&jump_version_js))
-               .arg("--raw-css-in-header")
+               .arg("--additional-css")
                .arg(&generate_jump_version_css(&jump_version_css))
                .arg("--markdown-no-toc")
                .arg("--index-page").arg(&builder.src.join("src/doc/index.md"))
@@ -550,9 +550,9 @@ impl Step for Std {
                  .arg("--markdown-css").arg("rust.css")
                  .arg("--markdown-no-toc")
                  .arg("--generate-redirect-pages")
-                 .arg("--raw-js-in-header")
+                 .arg("--additional-js")
                  .arg(&generate_jump_version_js(&jump_version_js))
-                 .arg("--raw-css-in-header")
+                 .arg("--additional-css")
                  .arg(&generate_jump_version_css(&jump_version_css))
                  .arg("--index-page").arg(&builder.src.join("src/doc/index.md"));
 
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
@@ -194,9 +194,9 @@ pub struct RenderOptions {
     pub generate_search_filter: bool,
     /// Option (disabled by default) to generate files used by RLS and some other tools.
     pub generate_redirect_pages: bool,
-    /// Additional JS file (through "--raw-js-in-header" option).
+    /// Additional JS file (through "--additional-js" option).
     pub additional_js: Option<String>,
-    /// Additional JS file (through "--raw-css-in-header" option).
+    /// Additional JS file (through "--additional-css" option).
     pub additional_css: Option<String>,
 }
 
@@ -446,8 +446,8 @@ impl Options {
         let generate_search_filter = !matches.opt_present("disable-per-crate-search");
         let persist_doctests = matches.opt_str("persist-doctests").map(PathBuf::from);
         let generate_redirect_pages = matches.opt_present("generate-redirect-pages");
-        let additional_js = matches.opt_str("raw-js-in-header");
-        let additional_css = matches.opt_str("raw-css-in-header");
+        let additional_js = matches.opt_str("additional-js");
+        let additional_css = matches.opt_str("additional-css");
 
         let (lint_opts, describe_lints, lint_cap) = get_cmd_lint_options(matches, error_format);
 
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -201,16 +201,16 @@ fn opts() -> Vec<RustcOptGroup> {
                         Markdown file or generated documentation",
                        "FILES")
         }),
-        unstable("raw-js-in-header", |o|  {
-            o.optopt("", "raw-js-in-header",
-                     "JS to include in the <head> section of a rendered Markdown file \
-                      or generated documentation",
+        unstable("additional-js", |o|  {
+            o.optopt("", "additional-js",
+                     "JS file to include as a static file to be linked from generated \
+                      documentation",
                      "text")
         }),
-        unstable("raw-css-in-header", |o|  {
-            o.optopt("", "raw-css-in-header",
-                     "CSS to include in the <head> section of a rendered Markdown file \
-                      or generated documentation",
+        unstable("additional-css", |o|  {
+            o.optopt("", "additional-css",
+                     "CSS file to include as a static file to be linked from generated \
+                      documentation",
                      "text")
         }),
         unstable("markdown-before-content", |o| {
