Skip to content

Commit f0727d0

Browse files
committed
Fix cargo fmt
1 parent 543b4ca commit f0727d0

File tree

1 file changed

+26
-9
lines changed

1 file changed

+26
-9
lines changed

src/renderer/html_handlebars/static_files.rs

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ impl StaticFiles {
213213
.as_bytes();
214214
let name =
215215
std::str::from_utf8(name).expect("resource name with invalid utf8");
216-
let resource_filename = hash_map.get(name).map(|s| &s[..]).unwrap_or(&name);
216+
let resource_filename =
217+
hash_map.get(name).map(|s| &s[..]).unwrap_or(&name);
217218
let path_to_root = utils::fs::path_to_root(&filename);
218219
format!("{}{}", path_to_root, resource_filename)
219220
.as_bytes()
@@ -250,7 +251,8 @@ impl StaticFiles {
250251
.as_bytes();
251252
let name =
252253
std::str::from_utf8(name).expect("resource name with invalid utf8");
253-
let resource_filename = hash_map.get(name).map(|s| &s[..]).unwrap_or(&name);
254+
let resource_filename =
255+
hash_map.get(name).map(|s| &s[..]).unwrap_or(&name);
254256
let path_to_root = utils::fs::path_to_root(&filename);
255257
format!("{}{}", path_to_root, resource_filename)
256258
.as_bytes()
@@ -277,8 +279,8 @@ impl StaticFiles {
277279
#[cfg(test)]
278280
mod tests {
279281
use super::*;
280-
use crate::theme::Theme;
281282
use crate::config::HtmlConfig;
283+
use crate::theme::Theme;
282284
use crate::utils::fs::write_file;
283285
use std::io::Read;
284286
#[test]
@@ -305,21 +307,36 @@ mod tests {
305307
let test_case = PathBuf::from("target/static-files-test-case");
306308
let mut html_config = HtmlConfig::default();
307309
html_config.additional_js.push(reference_js.clone());
308-
write_file(&Path::new("."), &reference_js, br#"{{ resource "book.js" }}"#).unwrap();
310+
write_file(
311+
&Path::new("."),
312+
&reference_js,
313+
br#"{{ resource "book.js" }}"#,
314+
)
315+
.unwrap();
309316
let mut static_files = StaticFiles::new(&theme, &html_config, &Path::new(".")).unwrap();
310317
static_files.hash_files().unwrap();
311318
static_files.write_files(&test_case).unwrap();
312319
// custom JS winds up referencing book.js
313-
let mut reference_js_dest = File::open("target/static-files-test-case/target/static-files-test-case-reference-635c9cdc.js").unwrap();
320+
let mut reference_js_dest = File::open(
321+
"target/static-files-test-case/target/static-files-test-case-reference-635c9cdc.js",
322+
)
323+
.unwrap();
314324
let mut reference_js_content = Vec::new();
315-
reference_js_dest.read_to_end(&mut reference_js_content).unwrap();
325+
reference_js_dest
326+
.read_to_end(&mut reference_js_content)
327+
.unwrap();
328+
std::mem::drop(reference_js_dest);
316329
assert_eq!(br#"../book-e3b0c442.js"#, &reference_js_content[..]);
317330
// book.js winds up empty
318-
let mut reference_js_dest = File::open("target/static-files-test-case/book-e3b0c442.js").unwrap();
331+
let mut reference_js_dest =
332+
File::open("target/static-files-test-case/book-e3b0c442.js").unwrap();
319333
let mut reference_js_content = Vec::new();
320-
reference_js_dest.read_to_end(&mut reference_js_content).unwrap();
334+
reference_js_dest
335+
.read_to_end(&mut reference_js_content)
336+
.unwrap();
337+
std::mem::drop(reference_js_dest);
321338
assert_eq!(br#""#, &reference_js_content[..]);
322339
std::fs::remove_dir_all(&test_case).unwrap();
323340
std::fs::remove_file(&reference_js).unwrap();
324341
}
325-
}
342+
}

0 commit comments

Comments
 (0)