rust/src/librustdoc/html/layout.rs

use std::fmt;
use std::path::PathBuf;

use crate::externalfiles::ExternalHtml;
use crate::html::render::SlashChecker;
use crate::html::format::Buffer;

#[derive(Clone)]
pub struct Layout {
    pub logo: String,
    pub favicon: String,
    pub external_html: ExternalHtml,
    pub krate: String,
}

pub struct Page<'a> {
    pub title: &'a str,
    pub css_class: &'a str,
    pub root_path: &'a str,
    pub static_root_path: Option<&'a str>,
    pub description: &'a str,
    pub keywords: &'a str,
    pub resource_suffix: &'a str,
    pub extra_scripts: &'a [&'a str],
    pub static_extra_scripts: &'a [&'a str],
}

pub fn render<T: fmt::Display, S: fmt::Display>(
    dst: &mut Buffer,
    layout: &Layout,
    page: &Page<'_>,
    sidebar: &S,
    t: &T,
    css_file_extension: bool,
    themes: &[PathBuf],
    generate_search_filter: bool,
) {
    let static_root_path = page.static_root_path.unwrap_or(page.root_path);
    write!(dst,
"<!DOCTYPE html>\
<html lang=\"en\">\
<head>\
    <meta charset=\"utf-8\">\
    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\
    <meta name=\"generator\" content=\"rustdoc\">\
    <meta name=\"description\" content=\"{description}\">\
    <meta name=\"keywords\" content=\"{keywords}\">\
    <title>{title}</title>\
    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}normalize{suffix}.css\">\
    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}rustdoc{suffix}.css\" \
          id=\"mainThemeStyle\">\
    {themes}\
    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}dark{suffix}.css\">\
    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}light{suffix}.css\" \
          id=\"themeStyle\">\
    <script src=\"{static_root_path}storage{suffix}.js\"></script>\
    <noscript><link rel=\"stylesheet\" href=\"{static_root_path}noscript{suffix}.css\"></noscript>\
    {css_extension}\
    {favicon}\
    {in_header}\
    <style type=\"text/css\">\
    #crate-search{{background-image:url(\"{static_root_path}down-arrow{suffix}.svg\");}}\
    </style>\
</head>\
<body class=\"rustdoc {css_class}\">\
    <!--[if lte IE 8]>\
    <div class=\"warning\">\
        This old browser is unsupported and will most likely display funky \
        things.\
    </div>\
    <![endif]-->\
    {before_content}\
    <nav class=\"sidebar\">\
        <div class=\"sidebar-menu\">&#9776;</div>\
        {logo}\
        {sidebar}\
    </nav>\
    <div class=\"theme-picker\">\
        <button id=\"theme-picker\" aria-label=\"Pick another theme!\">\
            <img src=\"{static_root_path}brush{suffix}.svg\" \
                 width=\"18\" \
                 alt=\"Pick another theme!\">\
        </button>\
        <div id=\"theme-choices\"></div>\
    </div>\
    <script src=\"{static_root_path}theme{suffix}.js\"></script>\
    <nav class=\"sub\">\
        <form class=\"search-form js-only\">\
            <div class=\"search-container\">\
                <div>{filter_crates}\
                    <input class=\"search-input\" name=\"search\" \
                           autocomplete=\"off\" \
                           spellcheck=\"false\" \
                           placeholder=\"Click or press ‘S’ to search, ‘?’ for more options…\" \
                           type=\"search\">\
                </div>\
                <a id=\"settings-menu\" href=\"{root_path}settings.html\">\
                    <img src=\"{static_root_path}wheel{suffix}.svg\" \
                         width=\"18\" \
                         alt=\"Change settings\">\
                </a>\
            </div>\
        </form>\
    </nav>\
    <section id=\"main\" class=\"content\">{content}</section>\
    <section id=\"search\" class=\"content hidden\"></section>\
    <section class=\"footer\"></section>\
    <aside id=\"help\" class=\"hidden\">\
        <div>\
            <h1 class=\"hidden\">Help</h1>\
            <div class=\"shortcuts\">\
                <h2>Keyboard Shortcuts</h2>\
                <dl>\
                    <dt><kbd>?</kbd></dt>\
                    <dd>Show this help dialog</dd>\
                    <dt><kbd>S</kbd></dt>\
                    <dd>Focus the search field</dd>\
                    <dt><kbd>↑</kbd></dt>\
                    <dd>Move up in search results</dd>\
                    <dt><kbd>↓</kbd></dt>\
                    <dd>Move down in search results</dd>\
                    <dt><kbd>↹</kbd></dt>\
                    <dd>Switch tab</dd>\
                    <dt><kbd>&#9166;</kbd></dt>\
                    <dd>Go to active search result</dd>\
                    <dt><kbd>+</kbd></dt>\
                    <dd>Expand all sections</dd>\
                    <dt><kbd>-</kbd></dt>\
                    <dd>Collapse all sections</dd>\
                </dl>\
            </div>\
            <div class=\"infos\">\
                <h2>Search Tricks</h2>\
                <p>\
                    Prefix searches with a type followed by a colon (e.g., \
                    <code>fn:</code>) to restrict the search to a given type.\
                </p>\
                <p>\
                    Accepted types are: <code>fn</code>, <code>mod</code>, \
                    <code>struct</code>, <code>enum</code>, \
                    <code>trait</code>, <code>type</code>, <code>macro</code>, \
                    and <code>const</code>.\
                </p>\
                <p>\
                    Search functions by type signature (e.g., \
                    <code>vec -> usize</code> or <code>* -> vec</code>)\
                </p>\
                <p>\
                    Search multiple things at once by splitting your query with comma (e.g., \
                    <code>str,u8</code> or <code>String,struct:Vec,test</code>)\
                </p>\
            </div>\
        </div>\
    </aside>\
    {after_content}\
    <script>\
        window.rootPath = \"{root_path}\";\
        window.currentCrate = \"{krate}\";\
    </script>\
    <script src=\"{root_path}aliases{suffix}.js\"></script>\
    <script src=\"{static_root_path}main{suffix}.js\"></script>\
    {static_extra_scripts}\
    {extra_scripts}\
    <script defer src=\"{root_path}search-index{suffix}.js\"></script>\
</body>\
</html>",
    css_extension = if css_file_extension {
        format!("<link rel=\"stylesheet\" \
                       type=\"text/css\" \
                       href=\"{static_root_path}theme{suffix}.css\">",
                static_root_path = static_root_path,
                suffix=page.resource_suffix)
    } else {
        String::new()
    },
    content   = *t,
    static_root_path = static_root_path,
    root_path = page.root_path,
    css_class = page.css_class,
    logo      = {
        let p = format!("{}{}", page.root_path, layout.krate);
        let p = SlashChecker(&p);
        if layout.logo.is_empty() {
            format!("<a href='{path}index.html'>\
                     <div class='logo-container'>\
                     <img src='{static_root_path}rust-logo{suffix}.png' alt='logo'></div></a>",
                    path=p,
                    static_root_path=static_root_path,
                    suffix=page.resource_suffix)
        } else {
            format!("<a href='{}index.html'>\
                     <div class='logo-container'><img src='{}' alt='logo'></div></a>",
                    p,
                    layout.logo)
        }
    },
    title     = page.title,
    description = page.description,
    keywords = page.keywords,
    favicon   = if layout.favicon.is_empty() {
        format!(r#"<link rel="shortcut icon" href="{static_root_path}favicon{suffix}.ico">"#,
                static_root_path=static_root_path,
                suffix=page.resource_suffix)
    } else {
        format!(r#"<link rel="shortcut icon" href="{}">"#, layout.favicon)
    },
    in_header = layout.external_html.in_header,
    before_content = layout.external_html.before_content,
    after_content = layout.external_html.after_content,
    sidebar   = *sidebar,
    krate     = layout.krate,
    themes = themes.iter()
                   .filter_map(|t| t.file_stem())
                   .filter_map(|t| t.to_str())
                   .map(|t| format!(r#"<link rel="stylesheet" type="text/css" href="{}{}{}.css">"#,
                                    static_root_path,
                                    t,
                                    page.resource_suffix))
                   .collect::<String>(),
    suffix=page.resource_suffix,
    static_extra_scripts=page.static_extra_scripts.iter().map(|e| {
        format!("<script src=\"{static_root_path}{extra_script}.js\"></script>",
                static_root_path=static_root_path,
                extra_script=e)
    }).collect::<String>(),
    extra_scripts=page.extra_scripts.iter().map(|e| {
        format!("<script src=\"{root_path}{extra_script}.js\"></script>",
                root_path=page.root_path,
                extra_script=e)
    }).collect::<String>(),
    filter_crates=if generate_search_filter {
        "<select id=\"crate-search\">\
            <option value=\"All crates\">All crates</option>\
        </select>"
    } else {
        ""
    },
    )
}

pub fn redirect(dst: &mut Buffer, url: &str) {
    // <script> triggers a redirect before refresh, so this is fine.
    write!(dst,
r##"<!DOCTYPE html>
<html lang="en">
<head>
    <meta http-equiv="refresh" content="0;URL={url}">
</head>
<body>
    <p>Redirecting to <a href="{url}">{url}</a>...</p>
    <script>location.replace("{url}" + location.search + location.hash);</script>
</body>
</html>"##,
    url = url,
    )
}
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								use std::fmt;
-												Fasten even more theme switch

											
										
										
											2018-01-23 00:45:34 +01:00
+								use std::path::PathBuf;
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
-												Transition librustdoc to 2018 edition

											
										
										
											2019-02-23 16:40:07 +09:00
+								use crate::externalfiles::ExternalHtml;
 								use crate::html::render::SlashChecker;
-												Migrate top-level rendering to Buffer

											
										
										
											2019-08-30 10:24:42 -04:00
+								use crate::html::format::Buffer;
-												Fix image link in the settings menu

											
										
										
											2019-01-31 15:42:45 +01:00
-												sed -i -s 's/#\[deriving(/#\[derive(/g' **/*.rs

											
										
										
											2015-01-03 22:54:18 -05:00
+								#[derive(Clone)]
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								pub struct Layout {
-												core: rename strbuf::StrBuf to string::String

[breaking-change]

											
										
										
											2014-05-22 16:57:53 -07:00
+								    pub logo: String,
 								    pub favicon: String,
-												Allow external html in rustdoc for crates.

Updated documentation to reflect md->html.
Modularized external file loading.

											
										
										
											2014-06-28 03:35:25 -07:00
+								    pub external_html: ExternalHtml,
-												core: rename strbuf::StrBuf to string::String

[breaking-change]

											
										
										
											2014-05-22 16:57:53 -07:00
+								    pub krate: String,
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								}
-												Make 'self lifetime illegal.

Also remove all instances of 'self within the codebase.

This fixes #10889.

											
										
										
											2013-12-09 23:16:18 -08:00
+								pub struct Page<'a> {
-												rustdoc: Switch field privacy as necessary

											
										
										
											2014-03-28 10:27:24 -07:00
+								    pub title: &'a str,
-												rustdoc: refactoring and tidying up

pulled out of #35020

											
										
										
											2016-08-03 13:14:59 +12:00
+								    pub css_class: &'a str,
-												rustdoc: Switch field privacy as necessary

											
										
										
											2014-03-28 10:27:24 -07:00
+								    pub root_path: &'a str,
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    pub static_root_path: Option<&'a str>,
-												rustdoc: Emit keywords for all crate pages

cc #12466

											
										
										
											2014-08-04 14:30:06 -07:00
+								    pub description: &'a str,
-												Add --extend-css option to rustdoc

											
										
										
											2016-03-13 15:36:01 +01:00
+								    pub keywords: &'a str,
-												Add resource-suffix option for rustdoc

											
										
										
											2018-02-24 19:14:36 +01:00
+								    pub resource_suffix: &'a str,
-												split extra_scripts to handle root_path shenanigans

											
										
										
											2018-12-20 10:57:03 -06:00
+								    pub extra_scripts: &'a [&'a str],
 								    pub static_extra_scripts: &'a [&'a str],
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								}
-												std: Rename Show/String to Debug/Display

This commit is an implementation of [RFC 565][rfc] which is a stabilization of
the `std::fmt` module and the implementations of various formatting traits.
Specifically, the following changes were performed:

[rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0565-show-string-guidelines.md

* The `Show` trait is now deprecated, it was renamed to `Debug`
* The `String` trait is now deprecated, it was renamed to `Display`
* Many `Debug` and `Display` implementations were audited in accordance with the
  RFC and audited implementations now have the `#[stable]` attribute
  * Integers and floats no longer print a suffix
  * Smart pointers no longer print details that they are a smart pointer
  * Paths with `Debug` are now quoted and escape characters
* The `unwrap` methods on `Result` now require `Display` instead of `Debug`
* The `Error` trait no longer has a `detail` method and now requires that
  `Display` must be implemented. With the loss of `String`, this has moved into
  libcore.
* `impl<E: Error> FromError<E> for Box<Error>` now exists
* `derive(Show)` has been renamed to `derive(Debug)`. This is not currently
  warned about due to warnings being emitted on stage1+

While backwards compatibility is attempted to be maintained with a blanket
implementation of `Display` for the old `String` trait (and the same for
`Show`/`Debug`) this is still a breaking change due to primitives no longer
implementing `String` as well as modifications such as `unwrap` and the `Error`
trait. Most code is fairly straightforward to update with a rename or tweaks of
method calls.

[breaking-change]
Closes #21436

											
										
										
											2015-01-20 15:45:07 -08:00
+								pub fn render<T: fmt::Display, S: fmt::Display>(
-												Migrate top-level rendering to Buffer

											
										
										
											2019-08-30 10:24:42 -04:00
+								    dst: &mut Buffer,
-												Add no-crate filter option on rustdoc

											
										
										
											2018-12-20 13:28:55 +01:00
+								    layout: &Layout,
-												Transition librustdoc to 2018 edition

											
										
										
											2019-02-23 16:40:07 +09:00
+								    page: &Page<'_>,
-												Add no-crate filter option on rustdoc

											
										
										
											2018-12-20 13:28:55 +01:00
+								    sidebar: &S,
 								    t: &T,
 								    css_file_extension: bool,
 								    themes: &[PathBuf],
 								    generate_search_filter: bool,
-												Migrate top-level rendering to Buffer

											
										
										
											2019-08-30 10:24:42 -04:00
+								) {
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    let static_root_path = page.static_root_path.unwrap_or(page.root_path);
-												rustdoc: nitpicks & cleanup

											
										
										
											2013-10-14 21:32:12 +02:00
+								    write!(dst,
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								"<!DOCTYPE html>\
 								<html lang=\"en\">\
 								<head>\
 								    <meta charset=\"utf-8\">\
 								    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\
 								    <meta name=\"generator\" content=\"rustdoc\">\
 								    <meta name=\"description\" content=\"{description}\">\
 								    <meta name=\"keywords\" content=\"{keywords}\">\
 								    <title>{title}</title>\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}normalize{suffix}.css\">\
 								    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}rustdoc{suffix}.css\" \
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								          id=\"mainThemeStyle\">\
 								    {themes}\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}dark{suffix}.css\">\
 								    <link rel=\"stylesheet\" type=\"text/css\" href=\"{static_root_path}light{suffix}.css\" \
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								          id=\"themeStyle\">\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    <script src=\"{static_root_path}storage{suffix}.js\"></script>\
 								    <noscript><link rel=\"stylesheet\" href=\"{static_root_path}noscript{suffix}.css\"></noscript>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								    {css_extension}\
 								    {favicon}\
 								    {in_header}\
-												Add arrow to the crate select box

											
										
										
											2018-11-29 01:29:49 +01:00
+								    <style type=\"text/css\">\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    #crate-search{{background-image:url(\"{static_root_path}down-arrow{suffix}.svg\");}}\
-												Add arrow to the crate select box

											
										
										
											2018-11-29 01:29:49 +01:00
+								    </style>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								</head>\
 								<body class=\"rustdoc {css_class}\">\
 								    <!--[if lte IE 8]>\
 								    <div class=\"warning\">\
 								        This old browser is unsupported and will most likely display funky \
 								        things.\
 								    </div>\
 								    <![endif]-->\
 								    {before_content}\
 								    <nav class=\"sidebar\">\
 								        <div class=\"sidebar-menu\">&#9776;</div>\
 								        {logo}\
 								        {sidebar}\
 								    </nav>\
 								    <div class=\"theme-picker\">\
 								        <button id=\"theme-picker\" aria-label=\"Pick another theme!\">\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								            <img src=\"{static_root_path}brush{suffix}.svg\" \
 								                 width=\"18\" \
 								                 alt=\"Pick another theme!\">\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								        </button>\
 								        <div id=\"theme-choices\"></div>\
 								    </div>\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    <script src=\"{static_root_path}theme{suffix}.js\"></script>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								    <nav class=\"sub\">\
 								        <form class=\"search-form js-only\">\
 								            <div class=\"search-container\">\
-												Add no-crate filter option on rustdoc

											
										
										
											2018-12-20 13:28:55 +01:00
+								                <div>{filter_crates}\
-												Add crate filtering

											
										
										
											2018-10-01 00:47:54 +02:00
+								                    <input class=\"search-input\" name=\"search\" \
 								                           autocomplete=\"off\" \
 								                           spellcheck=\"false\" \
 								                           placeholder=\"Click or press ‘S’ to search, ‘?’ for more options…\" \
 								                           type=\"search\">\
 								                </div>\
-												Add rustdoc settings menu

											
										
										
											2018-04-13 22:54:09 +02:00
+								                <a id=\"settings-menu\" href=\"{root_path}settings.html\">\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								                    <img src=\"{static_root_path}wheel{suffix}.svg\" \
 								                         width=\"18\" \
 								                         alt=\"Change settings\">\
-												Add rustdoc settings menu

											
										
										
											2018-04-13 22:54:09 +02:00
+								                </a>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								            </div>\
 								        </form>\
 								    </nav>\
 								    <section id=\"main\" class=\"content\">{content}</section>\
 								    <section id=\"search\" class=\"content hidden\"></section>\
 								    <section class=\"footer\"></section>\
 								    <aside id=\"help\" class=\"hidden\">\
 								        <div>\
 								            <h1 class=\"hidden\">Help</h1>\
 								            <div class=\"shortcuts\">\
 								                <h2>Keyboard Shortcuts</h2>\
 								                <dl>\
 								                    <dt><kbd>?</kbd></dt>\
 								                    <dd>Show this help dialog</dd>\
 								                    <dt><kbd>S</kbd></dt>\
 								                    <dd>Focus the search field</dd>\
 								                    <dt><kbd>↑</kbd></dt>\
 								                    <dd>Move up in search results</dd>\
 								                    <dt><kbd>↓</kbd></dt>\
 								                    <dd>Move down in search results</dd>\
 								                    <dt><kbd>↹</kbd></dt>\
 								                    <dd>Switch tab</dd>\
 								                    <dt><kbd>&#9166;</kbd></dt>\
 								                    <dd>Go to active search result</dd>\
 								                    <dt><kbd>+</kbd></dt>\
 								                    <dd>Expand all sections</dd>\
 								                    <dt><kbd>-</kbd></dt>\
 								                    <dd>Collapse all sections</dd>\
 								                </dl>\
 								            </div>\
 								            <div class=\"infos\">\
 								                <h2>Search Tricks</h2>\
 								                <p>\
-												Various minor/cosmetic improvements to code

											
										
										
											2018-11-27 02:59:49 +00:00
+								                    Prefix searches with a type followed by a colon (e.g., \
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								                    <code>fn:</code>) to restrict the search to a given type.\
 								                </p>\
 								                <p>\
 								                    Accepted types are: <code>fn</code>, <code>mod</code>, \
 								                    <code>struct</code>, <code>enum</code>, \
 								                    <code>trait</code>, <code>type</code>, <code>macro</code>, \
 								                    and <code>const</code>.\
 								                </p>\
 								                <p>\
-												Various minor/cosmetic improvements to code

											
										
										
											2018-11-27 02:59:49 +00:00
+								                    Search functions by type signature (e.g., \
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								                    <code>vec -> usize</code> or <code>* -> vec</code>)\
 								                </p>\
-												Add doc

											
										
										
											2018-04-14 17:20:36 +02:00
+								                <p>\
-												Various minor/cosmetic improvements to code

											
										
										
											2018-11-27 02:59:49 +00:00
+								                    Search multiple things at once by splitting your query with comma (e.g., \
-												Add doc

											
										
										
											2018-04-14 17:20:36 +02:00
+								                    <code>str,u8</code> or <code>String,struct:Vec,test</code>)\
 								                </p>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								            </div>\
 								        </div>\
 								    </aside>\
 								    {after_content}\
 								    <script>\
 								        window.rootPath = \"{root_path}\";\
 								        window.currentCrate = \"{krate}\";\
 								    </script>\
-												Apply resource-suffix to search-index and source-files scripts as well

											
										
										
											2019-04-07 18:09:28 +02:00
+								    <script src=\"{root_path}aliases{suffix}.js\"></script>\
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    <script src=\"{static_root_path}main{suffix}.js\"></script>\
-												split extra_scripts to handle root_path shenanigans

											
										
										
											2018-12-20 10:57:03 -06:00
+								    {static_extra_scripts}\
-												Add source file sidebar

											
										
										
											2018-11-06 01:40:12 +01:00
+								    {extra_scripts}\
-												Apply resource-suffix to search-index and source-files scripts as well

											
										
										
											2019-04-07 18:09:28 +02:00
+								    <script defer src=\"{root_path}search-index{suffix}.js\"></script>\
-												Small size reduction

											
										
										
											2018-04-14 17:13:46 +02:00
+								</body>\
 								</html>",
-												Add --extend-css option to rustdoc

											
										
										
											2016-03-13 15:36:01 +01:00
+								    css_extension = if css_file_extension {
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								        format!("<link rel=\"stylesheet\" \
 								                       type=\"text/css\" \
 								                       href=\"{static_root_path}theme{suffix}.css\">",
 								                static_root_path = static_root_path,
-												Add resource-suffix option for rustdoc

											
										
										
											2018-02-24 19:14:36 +01:00
+								                suffix=page.resource_suffix)
-												Add --extend-css option to rustdoc

											
										
										
											2016-03-13 15:36:01 +01:00
+								    } else {
-												use String::new() instead of String::from(""), "".to_string(), "".to_owned() or "".into()

											
										
										
											2018-08-23 10:14:52 +02:00
+								        String::new()
-												Add --extend-css option to rustdoc

											
										
										
											2016-03-13 15:36:01 +01:00
+								    },
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								    content   = *t,
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								    static_root_path = static_root_path,
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								    root_path = page.root_path,
-												rustdoc: refactoring and tidying up

pulled out of #35020

											
										
										
											2016-08-03 13:14:59 +12:00
+								    css_class = page.css_class,
-												Fix image link in the settings menu

											
										
										
											2019-01-31 15:42:45 +01:00
+								    logo      = {
 								        let p = format!("{}{}", page.root_path, layout.krate);
 								        let p = SlashChecker(&p);
 								        if layout.logo.is_empty() {
 								            format!("<a href='{path}index.html'>\
-												Wrap logo in container to prevent layout reflow

											
										
										
											2019-04-27 15:09:57 +02:00
+								                     <div class='logo-container'>\
-												Fix image position and display

											
										
										
											2019-04-29 11:45:06 +02:00
+								                     <img src='{static_root_path}rust-logo{suffix}.png' alt='logo'></div></a>",
-												Fix image link in the settings menu

											
										
										
											2019-01-31 15:42:45 +01:00
+								                    path=p,
 								                    static_root_path=static_root_path,
 								                    suffix=page.resource_suffix)
 								        } else {
 								            format!("<a href='{}index.html'>\
-												Fix image position and display

											
										
										
											2019-04-29 11:45:06 +02:00
+								                     <div class='logo-container'><img src='{}' alt='logo'></div></a>",
-												Fix image link in the settings menu

											
										
										
											2019-01-31 15:42:45 +01:00
+								                    p,
 								                    layout.logo)
 								        }
-												std: Remove i18n/l10n from format!

* The select/plural methods from format strings are removed
* The # character no longer needs to be escaped
* The \-based escapes have been removed
* '{{' is now an escape for '{'
* '}}' is now an escape for '}'

Closes #14810
[breaking-change]

											
										
										
											2014-05-28 09:24:28 -07:00
+								    },
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								    title     = page.title,
-												rustdoc: Use more descriptive description metadata.

This text appears in and improves search results.

cc #12466

											
										
										
											2014-08-04 13:53:33 -07:00
+								    description = page.description,
-												rustdoc: Emit keywords for all crate pages

cc #12466

											
										
										
											2014-08-04 14:30:06 -07:00
+								    keywords = page.keywords,
-												Positive case of `len()` -> `is_empty()`

`s/(?<!\{ self)(?<=\.)len\(\) == 0/is_empty()/g`

											
										
										
											2015-03-24 16:53:34 -07:00
+								    favicon   = if layout.favicon.is_empty() {
-												Add default favicon for documentation

											
										
										
											2019-01-12 22:27:09 +01:00
+								        format!(r#"<link rel="shortcut icon" href="{static_root_path}favicon{suffix}.ico">"#,
 								                static_root_path=static_root_path,
 								                suffix=page.resource_suffix)
-												std: Remove i18n/l10n from format!

* The select/plural methods from format strings are removed
* The # character no longer needs to be escaped
* The \-based escapes have been removed
* '{{' is now an escape for '{'
* '}}' is now an escape for '}'

Closes #14810
[breaking-change]

											
										
										
											2014-05-28 09:24:28 -07:00
+								    } else {
 								        format!(r#"<link rel="shortcut icon" href="{}">"#, layout.favicon)
 								    },
-												Allow external html in rustdoc for crates.

Updated documentation to reflect md->html.
Modularized external file loading.

											
										
										
											2014-06-28 03:35:25 -07:00
+								    in_header = layout.external_html.in_header,
 								    before_content = layout.external_html.before_content,
 								    after_content = layout.external_html.after_content,
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								    sidebar   = *sidebar,
-												Replace `crate` usage with `krate`

This patch replaces all `crate` usage with `krate` before introducing the
new keyword. This ensures that after introducing the keyword, there
won't be any compilation errors.

krate might not be the most expressive substitution for crate but it's a
very close abbreviation for it. `module` was already used in several
places already.

											
										
										
											2014-02-05 22:15:24 +01:00
+								    krate     = layout.krate,
-												Fasten even more theme switch

											
										
										
											2018-01-23 00:45:34 +01:00
+								    themes = themes.iter()
 								                   .filter_map(|t| t.file_stem())
 								                   .filter_map(|t| t.to_str())
-												Add rustdoc settings menu

											
										
										
											2018-04-13 22:54:09 +02:00
+								                   .map(|t| format!(r#"<link rel="stylesheet" type="text/css" href="{}{}{}.css">"#,
-												new --static-root-path flag for controlling static file locations

											
										
										
											2018-12-20 10:18:45 -06:00
+								                                    static_root_path,
-												Add rustdoc settings menu

											
										
										
											2018-04-13 22:54:09 +02:00
+								                                    t,
 								                                    page.resource_suffix))
-												Fasten even more theme switch

											
										
										
											2018-01-23 00:45:34 +01:00
+								                   .collect::<String>(),
-												Add resource-suffix option for rustdoc

											
										
										
											2018-02-24 19:14:36 +01:00
+								    suffix=page.resource_suffix,
-												split extra_scripts to handle root_path shenanigans

											
										
										
											2018-12-20 10:57:03 -06:00
+								    static_extra_scripts=page.static_extra_scripts.iter().map(|e| {
 								        format!("<script src=\"{static_root_path}{extra_script}.js\"></script>",
 								                static_root_path=static_root_path,
 								                extra_script=e)
 								    }).collect::<String>(),
 								    extra_scripts=page.extra_scripts.iter().map(|e| {
-												Don't generate suffix for source-file.js

											
										
										
											2018-12-03 22:37:34 +01:00
+								        format!("<script src=\"{root_path}{extra_script}.js\"></script>",
-												Add source file sidebar

											
										
										
											2018-11-06 01:40:12 +01:00
+								                root_path=page.root_path,
-												Don't generate suffix for source-file.js

											
										
										
											2018-12-03 22:37:34 +01:00
+								                extra_script=e)
-												Add source file sidebar

											
										
										
											2018-11-06 01:40:12 +01:00
+								    }).collect::<String>(),
-												Add no-crate filter option on rustdoc

											
										
										
											2018-12-20 13:28:55 +01:00
+								    filter_crates=if generate_search_filter {
 								        "<select id=\"crate-search\">\
 								            <option value=\"All crates\">All crates</option>\
 								        </select>"
 								    } else {
 								        ""
 								    },
-												rustdoc: Remove io_error usage

											
										
										
											2014-01-30 11:30:21 -08:00
+								    )
-												Implement a web backend for rustdoc_ng

This large commit implements and `html` output option for rustdoc_ng. The
executable has been altered to be invoked as "rustdoc_ng html <crate>" and
it will dump everything into the local "doc" directory. JSON can still be
generated by changing 'html' to 'json'.

This also fixes a number of bugs in rustdoc_ng relating to comment stripping,
along with some other various issues that I found along the way.

The `make doc` command has been altered to generate the new documentation into
the `doc/ng/$(CRATE)` directories.

											
										
										
											2013-09-18 22:18:38 -07:00
+								}
-												Migrate top-level rendering to Buffer

											
										
										
											2019-08-30 10:24:42 -04:00
+								pub fn redirect(dst: &mut Buffer, url: &str) {
-												rustdoc: Preserve query/fragment in redirects whenever possible.

We heavily rely on queries and fragments in the URL structure, so
it is desired to preserve them even in the redirects. The generated
redirect pages try to preserve them with scripts, which take
precedence over the original `Refresh` metadata. Non-scripting
browsers would continue to work (with no queries and fragments).

											
										
										
											2014-12-04 12:48:16 +09:00
+								    // <script> triggers a redirect before refresh, so this is fine.
-												rustdoc: Fix cross-crate links to reexported items

Cross crate links can target items which are not rendered in the documentation.
If the item is reexported at a higher level, the destination of the link (a
concatenation of the fully qualified name) may actually lead to nowhere. This
fixes this problem by altering rustdoc to emit pages which redirect to the local
copy of the reexported structure.

cc #14515
Closes #14137

											
										
										
											2014-05-29 13:50:47 -07:00
+								    write!(dst,
 								r##"<!DOCTYPE html>
 								<html lang="en">
 								<head>
 								    <meta http-equiv="refresh" content="0;URL={url}">
 								</head>
 								<body>
-												rustdoc: Preserve query/fragment in redirects whenever possible.

We heavily rely on queries and fragments in the URL structure, so
it is desired to preserve them even in the redirects. The generated
redirect pages try to preserve them with scripts, which take
precedence over the original `Refresh` metadata. Non-scripting
browsers would continue to work (with no queries and fragments).

											
										
										
											2014-12-04 12:48:16 +09:00
+								    <p>Redirecting to <a href="{url}">{url}</a>...</p>
 								    <script>location.replace("{url}" + location.search + location.hash);</script>
-												rustdoc: Fix cross-crate links to reexported items

Cross crate links can target items which are not rendered in the documentation.
If the item is reexported at a higher level, the destination of the link (a
concatenation of the fully qualified name) may actually lead to nowhere. This
fixes this problem by altering rustdoc to emit pages which redirect to the local
copy of the reexported structure.

cc #14515
Closes #14137

											
										
										
											2014-05-29 13:50:47 -07:00
+								</body>
 								</html>"##,
 								    url = url,
 								    )
 								}