Remove 'static lifetime from static vars (#947)
This commit is contained in:
parent
43ead86ecc
commit
53ba0d6655
|
@ -525,7 +525,7 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn can_determine_third_party_preprocessors() {
|
fn can_determine_third_party_preprocessors() {
|
||||||
let cfg_str: &'static str = r#"
|
let cfg_str = r#"
|
||||||
[book]
|
[book]
|
||||||
title = "Some Book"
|
title = "Some Book"
|
||||||
|
|
||||||
|
@ -564,7 +564,7 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn config_respects_preprocessor_selection() {
|
fn config_respects_preprocessor_selection() {
|
||||||
let cfg_str: &'static str = r#"
|
let cfg_str = r#"
|
||||||
[preprocessor.links]
|
[preprocessor.links]
|
||||||
renderers = ["html"]
|
renderers = ["html"]
|
||||||
"#;
|
"#;
|
||||||
|
|
|
@ -171,7 +171,7 @@ pub fn next(
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
static TEMPLATE: &'static str =
|
static TEMPLATE: &str =
|
||||||
"{{#previous}}{{title}}: {{link}}{{/previous}}|{{#next}}{{title}}: {{link}}{{/next}}";
|
"{{#previous}}{{title}}: {{link}}{{/previous}}|{{#next}}{{title}}: {{link}}{{/next}}";
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
|
@ -11,31 +11,27 @@ use std::path::Path;
|
||||||
|
|
||||||
use crate::errors::*;
|
use crate::errors::*;
|
||||||
|
|
||||||
pub static INDEX: &'static [u8] = include_bytes!("index.hbs");
|
pub static INDEX: &[u8] = include_bytes!("index.hbs");
|
||||||
pub static HEADER: &'static [u8] = include_bytes!("header.hbs");
|
pub static HEADER: &[u8] = include_bytes!("header.hbs");
|
||||||
pub static CHROME_CSS: &'static [u8] = include_bytes!("css/chrome.css");
|
pub static CHROME_CSS: &[u8] = include_bytes!("css/chrome.css");
|
||||||
pub static GENERAL_CSS: &'static [u8] = include_bytes!("css/general.css");
|
pub static GENERAL_CSS: &[u8] = include_bytes!("css/general.css");
|
||||||
pub static PRINT_CSS: &'static [u8] = include_bytes!("css/print.css");
|
pub static PRINT_CSS: &[u8] = include_bytes!("css/print.css");
|
||||||
pub static VARIABLES_CSS: &'static [u8] = include_bytes!("css/variables.css");
|
pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css");
|
||||||
pub static FAVICON: &'static [u8] = include_bytes!("favicon.png");
|
pub static FAVICON: &[u8] = include_bytes!("favicon.png");
|
||||||
pub static JS: &'static [u8] = include_bytes!("book.js");
|
pub static JS: &[u8] = include_bytes!("book.js");
|
||||||
pub static HIGHLIGHT_JS: &'static [u8] = include_bytes!("highlight.js");
|
pub static HIGHLIGHT_JS: &[u8] = include_bytes!("highlight.js");
|
||||||
pub static TOMORROW_NIGHT_CSS: &'static [u8] = include_bytes!("tomorrow-night.css");
|
pub static TOMORROW_NIGHT_CSS: &[u8] = include_bytes!("tomorrow-night.css");
|
||||||
pub static HIGHLIGHT_CSS: &'static [u8] = include_bytes!("highlight.css");
|
pub static HIGHLIGHT_CSS: &[u8] = include_bytes!("highlight.css");
|
||||||
pub static AYU_HIGHLIGHT_CSS: &'static [u8] = include_bytes!("ayu-highlight.css");
|
pub static AYU_HIGHLIGHT_CSS: &[u8] = include_bytes!("ayu-highlight.css");
|
||||||
pub static CLIPBOARD_JS: &'static [u8] = include_bytes!("clipboard.min.js");
|
pub static CLIPBOARD_JS: &[u8] = include_bytes!("clipboard.min.js");
|
||||||
pub static FONT_AWESOME: &'static [u8] = include_bytes!("FontAwesome/css/font-awesome.min.css");
|
pub static FONT_AWESOME: &[u8] = include_bytes!("FontAwesome/css/font-awesome.min.css");
|
||||||
pub static FONT_AWESOME_EOT: &'static [u8] =
|
pub static FONT_AWESOME_EOT: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot");
|
||||||
include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot");
|
pub static FONT_AWESOME_SVG: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg");
|
||||||
pub static FONT_AWESOME_SVG: &'static [u8] =
|
pub static FONT_AWESOME_TTF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf");
|
||||||
include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg");
|
pub static FONT_AWESOME_WOFF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff");
|
||||||
pub static FONT_AWESOME_TTF: &'static [u8] =
|
pub static FONT_AWESOME_WOFF2: &[u8] =
|
||||||
include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf");
|
|
||||||
pub static FONT_AWESOME_WOFF: &'static [u8] =
|
|
||||||
include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff");
|
|
||||||
pub static FONT_AWESOME_WOFF2: &'static [u8] =
|
|
||||||
include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2");
|
include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2");
|
||||||
pub static FONT_AWESOME_OTF: &'static [u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf");
|
pub static FONT_AWESOME_OTF: &[u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf");
|
||||||
|
|
||||||
/// The `Theme` struct should be used instead of the static variables because
|
/// The `Theme` struct should be used instead of the static variables because
|
||||||
/// the `new()` method will look if the user has a theme directory in their
|
/// the `new()` method will look if the user has a theme directory in their
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
//! Theme dependencies for the playpen editor.
|
//! Theme dependencies for the playpen editor.
|
||||||
|
|
||||||
pub static JS: &'static [u8] = include_bytes!("editor.js");
|
pub static JS: &[u8] = include_bytes!("editor.js");
|
||||||
pub static ACE_JS: &'static [u8] = include_bytes!("ace.js");
|
pub static ACE_JS: &[u8] = include_bytes!("ace.js");
|
||||||
pub static MODE_RUST_JS: &'static [u8] = include_bytes!("mode-rust.js");
|
pub static MODE_RUST_JS: &[u8] = include_bytes!("mode-rust.js");
|
||||||
pub static THEME_DAWN_JS: &'static [u8] = include_bytes!("theme-dawn.js");
|
pub static THEME_DAWN_JS: &[u8] = include_bytes!("theme-dawn.js");
|
||||||
pub static THEME_TOMORROW_NIGHT_JS: &'static [u8] = include_bytes!("theme-tomorrow_night.js");
|
pub static THEME_TOMORROW_NIGHT_JS: &[u8] = include_bytes!("theme-tomorrow_night.js");
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//! Theme dependencies for in-browser search. Not included in mdbook when
|
//! Theme dependencies for in-browser search. Not included in mdbook when
|
||||||
//! the "search" cargo feature is disabled.
|
//! the "search" cargo feature is disabled.
|
||||||
|
|
||||||
pub static JS: &'static [u8] = include_bytes!("searcher.js");
|
pub static JS: &[u8] = include_bytes!("searcher.js");
|
||||||
pub static MARK_JS: &'static [u8] = include_bytes!("mark.min.js");
|
pub static MARK_JS: &[u8] = include_bytes!("mark.min.js");
|
||||||
pub static ELASTICLUNR_JS: &'static [u8] = include_bytes!("elasticlunr.min.js");
|
pub static ELASTICLUNR_JS: &[u8] = include_bytes!("elasticlunr.min.js");
|
||||||
|
|
|
@ -35,7 +35,7 @@ fn run_mdbook_init_should_create_content_from_summary() {
|
||||||
let temp = TempFileBuilder::new().prefix("mdbook").tempdir().unwrap();
|
let temp = TempFileBuilder::new().prefix("mdbook").tempdir().unwrap();
|
||||||
let src_dir = temp.path().join("src");
|
let src_dir = temp.path().join("src");
|
||||||
fs::create_dir_all(src_dir.clone()).unwrap();
|
fs::create_dir_all(src_dir.clone()).unwrap();
|
||||||
static SUMMARY: &'static str = r#"# Summary
|
static SUMMARY: &str = r#"# Summary
|
||||||
|
|
||||||
[intro](intro.md)
|
[intro](intro.md)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue