Browse Source

Format code using cargo fmt (#896)

index-subcmd
Sam Ford Vincent Prouillet 4 years ago
parent
commit
b63c563622
7 changed files with 19 additions and 24 deletions
  1. +1
    -3
      components/front_matter/src/page.rs
  2. +4
    -1
      components/library/src/content/page.rs
  3. +1
    -5
      components/library/src/pagination/mod.rs
  4. +1
    -5
      components/library/src/taxonomies/mod.rs
  5. +8
    -4
      components/rendering/src/markdown.rs
  6. +1
    -1
      components/utils/src/lib.rs
  7. +3
    -5
      components/utils/src/slugs.rs

+ 1
- 3
components/front_matter/src/page.rs View File

@@ -90,9 +90,7 @@ impl PageFrontMatter {
if d.contains('T') { if d.contains('T') {
DateTime::parse_from_rfc3339(&d).ok().map(|s| s.naive_local()) DateTime::parse_from_rfc3339(&d).ok().map(|s| s.naive_local())
} else { } else {
NaiveDate::parse_from_str(&d, "%Y-%m-%d")
.ok()
.map(|s| s.and_hms(0, 0, 0))
NaiveDate::parse_from_str(&d, "%Y-%m-%d").ok().map(|s| s.and_hms(0, 0, 0))
} }
} else { } else {
None None


+ 4
- 1
components/library/src/content/page.rs View File

@@ -167,7 +167,10 @@ impl Page {
if let Some(slug) = slug_from_dated_filename { if let Some(slug) = slug_from_dated_filename {
maybe_slugify_paths(&slug, config.slugify_paths) maybe_slugify_paths(&slug, config.slugify_paths)
} else { } else {
maybe_slugify_paths(parent.file_name().unwrap().to_str().unwrap(), config.slugify_paths)
maybe_slugify_paths(
parent.file_name().unwrap().to_str().unwrap(),
config.slugify_paths,
)
} }
} else { } else {
maybe_slugify_paths(&page.file.name, config.slugify_paths) maybe_slugify_paths(&page.file.name, config.slugify_paths)


+ 1
- 5
components/library/src/pagination/mod.rs View File

@@ -195,10 +195,7 @@ impl<'a> Paginator<'a> {
} else { } else {
format!("{}{}/", self.permalink, self.paginate_path) format!("{}{}/", self.permalink, self.paginate_path)
}; };
paginator.insert(
"base_url",
to_value(&base_url).unwrap(),
);
paginator.insert("base_url", to_value(&base_url).unwrap());
paginator.insert("pages", to_value(&current_pager.pages).unwrap()); paginator.insert("pages", to_value(&current_pager.pages).unwrap());
paginator.insert("current_index", to_value(current_pager.index).unwrap()); paginator.insert("current_index", to_value(current_pager.index).unwrap());
paginator.insert("total_pages", to_value(self.all_pages.len()).unwrap()); paginator.insert("total_pages", to_value(self.all_pages.len()).unwrap());
@@ -384,7 +381,6 @@ mod tests {
assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/posts/2/"); assert_eq!(paginator.pagers[1].permalink, "https://vincent.is/posts/2/");
assert_eq!(paginator.pagers[1].path, "posts/2/"); assert_eq!(paginator.pagers[1].path, "posts/2/");



let context = paginator.build_paginator_context(&paginator.pagers[0]); let context = paginator.build_paginator_context(&paginator.pagers[0]);
assert_eq!(context["base_url"], to_value("https://vincent.is/posts/").unwrap()); assert_eq!(context["base_url"], to_value("https://vincent.is/posts/").unwrap());
} }


+ 1
- 5
components/library/src/taxonomies/mod.rs View File

@@ -591,10 +591,7 @@ mod tests {


assert_eq!(categories.items.len(), 1); assert_eq!(categories.items.len(), 1);
assert_eq!(categories.items[0].name, "Écologie"); assert_eq!(categories.items[0].name, "Écologie");
assert_eq!(
categories.items[0].permalink,
"http://a-website.com/fr/catégories/Écologie/"
);
assert_eq!(categories.items[0].permalink, "http://a-website.com/fr/catégories/Écologie/");
assert_eq!(categories.items[0].pages.len(), 1); assert_eq!(categories.items[0].pages.len(), 1);
} }


@@ -711,5 +708,4 @@ mod tests {
); );
assert_eq!(categories.items[1].pages.len(), 1); assert_eq!(categories.items[1].pages.len(), 1);
} }

} }

+ 8
- 4
components/rendering/src/markdown.rs View File

@@ -12,8 +12,8 @@ use config::highlighting::{get_highlighter, SYNTAX_SET, THEME_SET};
use errors::{Error, Result}; use errors::{Error, Result};
use front_matter::InsertAnchor; use front_matter::InsertAnchor;
use utils::site::resolve_internal_link; use utils::site::resolve_internal_link;
use utils::vec::InsertMany;
use utils::slugs::maybe_slugify_anchors; use utils::slugs::maybe_slugify_anchors;
use utils::vec::InsertMany;


use self::cmark::{Event, LinkType, Options, Parser, Tag}; use self::cmark::{Event, LinkType, Options, Parser, Tag};


@@ -297,9 +297,13 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Render
let start_idx = heading_ref.start_idx; let start_idx = heading_ref.start_idx;
let end_idx = heading_ref.end_idx; let end_idx = heading_ref.end_idx;
let title = get_text(&events[start_idx + 1..end_idx]); let title = get_text(&events[start_idx + 1..end_idx]);
let id = heading_ref
.id
.unwrap_or_else(|| find_anchor(&inserted_anchors, maybe_slugify_anchors(&title, context.config.slugify_paths), 0));
let id = heading_ref.id.unwrap_or_else(|| {
find_anchor(
&inserted_anchors,
maybe_slugify_anchors(&title, context.config.slugify_paths),
0,
)
});
inserted_anchors.push(id.clone()); inserted_anchors.push(id.clone());


// insert `id` to the tag // insert `id` to the tag


+ 1
- 1
components/utils/src/lib.rs View File

@@ -2,6 +2,6 @@ pub mod de;
pub mod fs; pub mod fs;
pub mod net; pub mod net;
pub mod site; pub mod site;
pub mod slugs;
pub mod templates; pub mod templates;
pub mod vec; pub mod vec;
pub mod slugs;

+ 3
- 5
components/utils/src/slugs.rs View File

@@ -1,6 +1,6 @@
fn strip_chars(s: &str, chars: &str) -> String { fn strip_chars(s: &str, chars: &str) -> String {
let mut sanitized_string = s.to_string(); let mut sanitized_string = s.to_string();
sanitized_string.retain( |c| !chars.contains(c));
sanitized_string.retain(|c| !chars.contains(c));
sanitized_string sanitized_string
} }


@@ -24,8 +24,7 @@ pub fn maybe_slugify_paths(s: &str, slugify: bool) -> String {
if slugify { if slugify {
// ASCII slugification // ASCII slugification
slug::slugify(s) slug::slugify(s)
}
else {
} else {
// Only remove forbidden characters // Only remove forbidden characters
strip_invalid_paths_chars(s) strip_invalid_paths_chars(s)
} }
@@ -35,8 +34,7 @@ pub fn maybe_slugify_anchors(s: &str, slugify: bool) -> String {
if slugify { if slugify {
// ASCII slugification // ASCII slugification
slug::slugify(s) slug::slugify(s)
}
else {
} else {
// Only remove forbidden characters // Only remove forbidden characters
strip_invalid_anchors_chars(s) strip_invalid_anchors_chars(s)
} }


Loading…
Cancel
Save