Skip to content

Commit ecc7600

Browse files
committed
rustfmt: Fix broken formatting
1 parent 96d4bc1 commit ecc7600

File tree

5 files changed

+33
-20
lines changed

5 files changed

+33
-20
lines changed

serve/src/main.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ async fn main() -> Result<(), Box<dyn Error>> {
66

77
let footer = format!("{} {}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
88

9-
warpy::server::run(format!("{}/../site", env!("CARGO_MANIFEST_DIR")), [0, 0, 0, 0], footer, Some(8000), false).await?;
9+
warpy::server::run(
10+
format!("{}/../site", env!("CARGO_MANIFEST_DIR")),
11+
[0, 0, 0, 0],
12+
footer,
13+
Some(8000),
14+
false,
15+
)
16+
.await?;
1017
Ok(())
1118
}

src/blog.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@ pub fn main() -> eyre::Result<()> {
66

77
lib::main()?;
88

9-
println!("blog has been generated; you can now serve its content by running\n\
9+
println!(
10+
"blog has been generated; you can now serve its content by running\n\
1011
{INDENT}python3 -m http.server --directory {ROOT}/site\n\
1112
or running:\n\
1213
{INDENT}cargo run -p serve\n\
1314
or you can read it directly by opening a web browser on:\n\
1415
{INDENT}file:///{ROOT}/site/index.html",
15-
ROOT=env!("CARGO_MANIFEST_DIR"), INDENT=" ");
16+
ROOT = env!("CARGO_MANIFEST_DIR"),
17+
INDENT = " "
18+
);
1619

1720
Ok(())
1821
}

src/blogs.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,7 @@ pub(crate) fn load(base: &Path) -> eyre::Result<Vec<Blog>> {
127127
Ok(blogs)
128128
}
129129

130-
fn load_recursive(
131-
base: &Path,
132-
current: &Path,
133-
blogs: &mut Vec<Blog>,
134-
) -> eyre::Result<()> {
130+
fn load_recursive(base: &Path, current: &Path, blogs: &mut Vec<Blog>) -> eyre::Result<()> {
135131
for entry in std::fs::read_dir(current)? {
136132
let path = entry?.path();
137133
let file_type = path.metadata()?.file_type();

src/lib.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ mod posts;
44
use self::blogs::Blog;
55
use self::posts::Post;
66
use chrono::Timelike;
7+
use eyre::{eyre, WrapErr};
78
use handlebars::{handlebars_helper, Handlebars};
9+
use rayon::prelude::*;
810
use sass_rs::{compile_file, Options};
911
use serde_derive::Serialize;
1012
use serde_json::json;
1113
use std::convert::AsRef;
1214
use std::fs::{self, File};
1315
use std::io::{self, Write};
1416
use std::path::{Path, PathBuf};
15-
use eyre::{eyre, WrapErr};
16-
use rayon::prelude::*;
1717

1818
struct Generator<'a> {
1919
handlebars: Handlebars<'a>,
@@ -102,22 +102,23 @@ impl<'a> Generator<'a> {
102102
let css = compile_file(&scss_file, Options::default())
103103
.map_err(|error| eyre!(error))
104104
.wrap_err_with(|| format!("couldn't compile sass: {}", &scss_file))?;
105-
let mut file =
106-
File::create(&css_file).wrap_err_with(|| format!("couldn't make css file: {}", &css_file))?;
105+
let mut file = File::create(&css_file)
106+
.wrap_err_with(|| format!("couldn't make css file: {}", &css_file))?;
107107
file.write_all(&css.into_bytes())
108108
.wrap_err_with(|| format!("couldn't write css file: {}", &css_file))?;
109109

110110
Ok(())
111111
}
112112

113-
fn concat_vendor_css(&self, files: Vec<&str>)-> eyre::Result<()> {
113+
fn concat_vendor_css(&self, files: Vec<&str>) -> eyre::Result<()> {
114114
let mut concatted = String::new();
115115
for filestem in files {
116116
let vendor_path = format!("./static/styles/{}.css", filestem);
117117
let contents = fs::read_to_string(vendor_path).wrap_err("couldn't read vendor css")?;
118118
concatted.push_str(&contents);
119119
}
120-
fs::write("./static/styles/vendor.css", &concatted).wrap_err("couldn't write vendor css")?;
120+
fs::write("./static/styles/vendor.css", &concatted)
121+
.wrap_err("couldn't write vendor css")?;
121122

122123
Ok(())
123124
}
@@ -132,7 +133,11 @@ impl<'a> Generator<'a> {
132133
self.render_feed(blog)?;
133134
self.render_releases_feed(blog)?;
134135

135-
let paths = blog.posts().par_iter().map(|post| self.render_post(blog, post)).collect::<Result<Vec<_>, _>>()?;
136+
let paths = blog
137+
.posts()
138+
.par_iter()
139+
.map(|post| self.render_post(blog, post))
140+
.collect::<Result<Vec<_>, _>>()?;
136141
if let Some(path) = paths.first() {
137142
println!("└─ Latest post: {}\n", self.file_url(path));
138143
}

src/posts.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::blogs::Manifest;
2+
use eyre::eyre;
23
use regex::Regex;
34
use serde_derive::{Deserialize, Serialize};
45
use std::path::{Path, PathBuf};
5-
use eyre::eyre;
66

77
#[derive(Debug, PartialEq, Deserialize)]
88
struct YamlHeader {
@@ -50,9 +50,9 @@ impl Post {
5050

5151
let contents = std::fs::read_to_string(path)?;
5252
if contents.len() < 5 {
53-
return Err(
54-
eyre!("{path:?} is empty, or too short to have valid front matter")
55-
);
53+
return Err(eyre!(
54+
"{path:?} is empty, or too short to have valid front matter"
55+
));
5656
}
5757

5858
// yaml headers.... we know the first four bytes of each file are "---\n"
@@ -68,7 +68,9 @@ impl Post {
6868
} = serde_yaml::from_str(yaml)?;
6969
// next, the contents. we add + to get rid of the final "---\n\n"
7070
let options = comrak::Options {
71-
render: comrak::RenderOptionsBuilder::default().unsafe_(true).build()?,
71+
render: comrak::RenderOptionsBuilder::default()
72+
.unsafe_(true)
73+
.build()?,
7274
extension: comrak::ExtensionOptionsBuilder::default()
7375
.header_ids(Some(String::new()))
7476
.footnotes(true)

0 commit comments

Comments
 (0)