Update deps + fmt

6 years ago · 7af314c61e
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,7 +161,7 @@ name = "arrayvec"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -400,7 +400,7 @@ dependencies = [
 "crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -599,7 +599,7 @@ dependencies = [
 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "image 0.20.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "syntect 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -676,7 +676,7 @@ dependencies = [
 "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
@@ -937,7 +937,7 @@ dependencies = [
 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]

@@ -1068,7 +1068,7 @@ dependencies = [
 "slotmap 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]
@@ -1078,7 +1078,7 @@ name = "link_checker"
 version = "0.1.0"
 dependencies = [
 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
@@ -1312,7 +1312,7 @@ dependencies = [

 [[package]]
 name = "nodrop"
 version = "0.1.12"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -1729,13 +1729,13 @@ dependencies = [
 "slug 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "syntect 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "templates 0.1.0",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]

 [[package]]
 name = "reqwest"
 version = "0.9.4"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1974,7 +1974,7 @@ dependencies = [
 "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "templates 0.1.0",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
 ]

@@ -2155,9 +2155,9 @@ dependencies = [
 "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "library 0.1.0",
 "pulldown-cmark 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "utils 0.1.0",
@@ -2175,7 +2175,7 @@ dependencies = [

 [[package]]
 name = "tera"
 version = "0.11.19"
 version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
 "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2618,7 +2618,7 @@ dependencies = [
 "errors 0.1.0",
 "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2938,7 +2938,7 @@ dependencies = [
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
 "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17"
 "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum notify 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "873ecfd8c174964ae30f401329d140142312c8e5590719cf1199d5f1717d8078"
 "checksum num-derive 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8af1847c907c2f04d7bfd572fb25bbb4385c637fe5be163cf2f8c5d778fe1e7d"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
@@ -2982,7 +2982,7 @@ dependencies = [
 "checksum regex 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467"
 "checksum regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fbc557aac2b708fe84121caf261346cc2eed71978024337e42eb46b8a252ac6e"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
 "checksum reqwest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "00a5870d8edc74fc6e1eb58edbd2815d2243e1a2255d6bf9c82a7a875901b5db"
 "checksum reqwest 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ab52e462d1e15891441aeefadff68bdea005174328ce3da0a314f2ad313ec837"
 "checksum resolv-conf 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c62bd95a41841efdf7fca2ae9951e64a8d8eae7e5da196d8ce489a2241491a92"
 "checksum rust-stemmers 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fbf06149ec391025664a5634200ced1afb489f0f3f8a140d515ebc0eb04b4bc0"
 "checksum rustc-demangle 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395"
@@ -3026,7 +3026,7 @@ dependencies = [
 "checksum syntect 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e02dd9df97a68a2d005ace28ff24c610abfc3ce17afcfdb22a077645dabb599a"
 "checksum tempfile 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "55c1195ef8513f3273d55ff59fe5da6940287a0d7a98331254397f464833675b"
 "checksum tendril 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9de21546595a0873061940d994bbbc5c35f024ae4fd61ec5c5b159115684f508"
 "checksum tera 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac6d8ad623a7efcfb4367ce2a36f84ef849d5aa3c7bcf2e0324c4cbcc57ebaf"
 "checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
 "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
--- a/components/library/src/content/section.rs
+++ b/components/library/src/content/section.rs
@@ -133,7 +133,7 @@ impl Section {
            Some(ref l) => l,
            None => {
                if self.is_index() {
                    return "index.html"
                    return "index.html";
                }
                "section.html"
            }
--- a/components/library/src/library.rs
+++ b/components/library/src/library.rs
@@ -298,7 +298,8 @@ impl Library {
    }

    pub fn get_section_mut<P: AsRef<Path>>(&mut self, path: P) -> Option<&mut Section> {
        self.sections.get_mut(self.paths_to_sections.get(path.as_ref()).cloned().unwrap_or_default())
        self.sections
            .get_mut(self.paths_to_sections.get(path.as_ref()).cloned().unwrap_or_default())
    }

    pub fn get_section_by_key(&self, key: Key) -> &Section {
--- a/components/rebuild/src/lib.rs
+++ b/components/rebuild/src/lib.rs
@@ -60,8 +60,6 @@ fn find_section_front_matter_changes(
        return changes_needed;
    }



    if current.paginate_by != new.paginate_by
        || current.paginate_path != new.paginate_path
        || current.insert_anchor_links != new.insert_anchor_links
@@ -132,7 +130,7 @@ fn delete_element(site: &mut Site, path: &Path, is_section: bool) -> Result<()>
 fn handle_section_editing(site: &mut Site, path: &Path) -> Result<()> {
    let section = Section::from_file(path, &site.config)?;
    let pathbuf = path.to_path_buf();
    match site.add_section(section,true)? {
    match site.add_section(section, true)? {
        // Updating a section
        Some(prev) => {
            site.populate_sections();
@@ -240,7 +238,6 @@ fn handle_page_editing(site: &mut Site, path: &Path) -> Result<()> {
    }
 }


 /// What happens when we rename a file/folder in the content directory.
 /// Note that this is only called for folders when it isn't empty
 pub fn after_content_rename(site: &mut Site, old: &Path, new: &Path) -> Result<()> {
@@ -285,7 +282,6 @@ pub fn after_content_rename(site: &mut Site, old: &Path, new: &Path) -> Result<(
    return handle_page_editing(site, &new_path);
 }


 /// What happens when a section or a page is created/edited
 pub fn after_content_change(site: &mut Site, path: &Path) -> Result<()> {
    let is_section = path.file_name().unwrap() == "_index.md";
--- a/components/rebuild/tests/rebuild.rs
+++ b/components/rebuild/tests/rebuild.rs
@@ -78,7 +78,6 @@ macro_rules! rename {
    }};
 }


 #[test]
 fn can_rebuild_after_simple_change_to_page_content() {
    let tmp_dir = tempdir().expect("create temp dir");
@@ -177,11 +176,7 @@ insert_anchor_links = "left"

    let res = after_content_change(&mut site, &file_path);
    assert!(res.is_ok());
    assert!(!file_contains!(
        site_path,
        "public/posts/index.html",
        "A transparent page"
    ));
    assert!(!file_contains!(site_path, "public/posts/index.html", "A transparent page"));
 }

 #[test]
@@ -193,11 +188,7 @@ fn can_rebuild_after_renaming_page() {
    let res = after_content_rename(&mut site, &old_path, &new_path);
    println!("{:?}", res);
    assert!(res.is_ok());
    assert!(file_contains!(
        site_path,
        "public/posts/hard/index.html",
        "A simple page"
    ));
    assert!(file_contains!(site_path, "public/posts/hard/index.html", "A simple page"));
 }

 // https://github.com/Keats/gutenberg/issues/385
@@ -205,7 +196,8 @@ fn can_rebuild_after_renaming_page() {
 fn can_rebuild_after_renaming_colocated_asset_folder() {
    let tmp_dir = tempdir().expect("create temp dir");
    let (site_path, mut site) = load_and_build_site!(tmp_dir);
    let (old_path, new_path) = rename!(site_path, "content/posts/with-assets", "with-assets-updated");
    let (old_path, new_path) =
        rename!(site_path, "content/posts/with-assets", "with-assets-updated");
    assert!(file_contains!(site_path, "content/posts/with-assets-updated/index.md", "Hello"));

    let res = after_content_rename(&mut site, &old_path, &new_path);
--- a/components/rendering/tests/markdown.rs
+++ b/components/rendering/tests/markdown.rs
@@ -122,9 +122,9 @@ fn can_render_shortcode_with_markdown_char_in_args_value() {
    ];
    for i in input {
        let res = render_content(&format!("{{{{ youtube(id=\"{}\") }}}}", i), &context).unwrap();
        assert!(
            res.body.contains(&format!(r#"<iframe src="https://www.youtube.com/embed/{}""#, i))
        );
        assert!(res
            .body
            .contains(&format!(r#"<iframe src="https://www.youtube.com/embed/{}""#, i)));
    }
 }

@@ -238,9 +238,9 @@ Hello
    .unwrap();
    assert!(res.body.contains("<p>Hello</p>\n<div >"));
    assert!(res.body.contains(r#"<iframe src="https://www.youtube.com/embed/ub36ffWAqgQ""#));
    assert!(
        res.body.contains(r#"<iframe src="https://www.youtube.com/embed/ub36ffWAqgQ?autoplay=1""#)
    );
    assert!(res
        .body
        .contains(r#"<iframe src="https://www.youtube.com/embed/ub36ffWAqgQ?autoplay=1""#));
    assert!(res.body.contains(r#"<iframe src="https://www.streamable.com/e/c0ic""#));
    assert!(res.body.contains(r#"//player.vimeo.com/video/210073083""#));
 }
--- a/components/site/tests/site.rs
+++ b/components/site/tests/site.rs
@@ -584,7 +584,8 @@ fn can_apply_page_templates() {
    assert_eq!(override_page_template.meta.title, Some("Override".into()));

    // It should have applied recursively as well
    let another_section = site.library.get_section(&template_path.join("another_section").join("_index.md")).unwrap();
    let another_section =
        site.library.get_section(&template_path.join("another_section").join("_index.md")).unwrap();
    assert_eq!(another_section.subsections.len(), 0);
    assert_eq!(another_section.pages.len(), 1);

@@ -593,7 +594,10 @@ fn can_apply_page_templates() {
    assert_eq!(changed_recursively.meta.title, Some("Changed recursively".into()));

    // But it should not have override a children page_template
    let yet_another_section = site.library.get_section(&template_path.join("yet_another_section").join("_index.md")).unwrap();
    let yet_another_section = site
        .library
        .get_section(&template_path.join("yet_another_section").join("_index.md"))
        .unwrap();
    assert_eq!(yet_another_section.subsections.len(), 0);
    assert_eq!(yet_another_section.pages.len(), 1);

--- a/components/templates/src/global_fns/load_data.rs
+++ b/components/templates/src/global_fns/load_data.rs
@@ -334,12 +334,10 @@ mod tests {
        args.insert("format".to_string(), to_value("plain").unwrap());
        let result = static_fn(args);
        assert!(result.is_err());
        assert!(
            result
                .unwrap_err()
                .description()
                .contains("README.md is not inside the base site directory")
        );
        assert!(result
            .unwrap_err()
            .description()
            .contains("README.md is not inside the base site directory"));
    }

    #[test]
--- a/src/cmd/serve.rs
+++ b/src/cmd/serve.rs
@@ -22,7 +22,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 use std::env;
 use std::fs::{remove_dir_all, File, read_dir};
 use std::fs::{read_dir, remove_dir_all, File};
 use std::io::{self, Read};
 use std::path::{Path, PathBuf, MAIN_SEPARATOR};
 use std::sync::mpsc::channel;
@@ -399,7 +399,6 @@ pub fn serve(
                            }
                        }
                        console::report_elapsed_time(start);

                    }
                    Create(path) | Write(path) | Remove(path) => {
                        if is_temp_file(&path) || path.is_dir() {
@@ -511,7 +510,6 @@ fn is_folder_empty(dir: &Path) -> bool {
    true
 }


 #[cfg(test)]
 mod tests {
    use std::path::{Path, PathBuf};