From 4d587b459edefb8dfe59574266d4bcdc432ce451 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Sun, 18 Sep 2022 07:37:27 +0000 Subject: [PATCH] Format the code --- build.rs | 28 ++++++++++++++++++++-------- rustfmt.toml | 3 +++ src/data/exif.rs | 5 +---- src/fanbox/article/url_embed.rs | 5 ++++- 4 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 rustfmt.toml diff --git a/build.rs b/build.rs index b72103c..ab36111 100644 --- a/build.rs +++ b/build.rs @@ -28,14 +28,17 @@ fn main() { create_dir(&utils_build_path).unwrap(); } let mut config = cmake::Config::new("utils"); - config.define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) + config + .define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) .out_dir(utils_build_path) .define("ENABLE_ICONV", "OFF") .define("ENABLE_STANDALONE", "ON") .define("ENABLE_CXX17", "ON") .define("INSTALL_DEP_FILES", "ON"); #[cfg(all(windows, target_env = "msvc"))] - config.define("CMAKE_BUILD_TYPE", "Release").generator("Ninja"); + config + .define("CMAKE_BUILD_TYPE", "Release") + .generator("Ninja"); config.build(); let dep_path = out_path.join("utils_dep.txt"); let mut f = File::open(dep_path).unwrap(); @@ -65,10 +68,13 @@ fn main() { create_dir(&avdict_build_path).unwrap(); } let mut config = cmake::Config::new("avdict"); - config.define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) + config + .define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) .out_dir(avdict_build_path); #[cfg(all(windows, target_env = "msvc"))] - config.define("CMAKE_BUILD_TYPE", "Release").generator("Ninja"); + config + .define("CMAKE_BUILD_TYPE", "Release") + .generator("Ninja"); config.build(); println!("cargo:rustc-link-search=native={}/lib", out_path.display()); let dep_path = out_path.join("avdict_dep.txt"); @@ -113,11 +119,14 @@ fn main() { create_dir(&exif_build_path).unwrap(); } let mut config = cmake::Config::new("exif"); - config.define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) + config + .define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) .out_dir(exif_build_path) .define("UTILS_LIBRARY", utils_build_path.to_str().unwrap()); #[cfg(all(windows, target_env = "msvc"))] - config.define("CMAKE_BUILD_TYPE", "Release").generator("Ninja"); + config + .define("CMAKE_BUILD_TYPE", "Release") + .generator("Ninja"); config.build(); println!("cargo:rustc-link-search=native={}/lib", out_path.display()); let dep_path = out_path.join("exif_dep.txt"); @@ -163,11 +172,14 @@ fn main() { create_dir(&ugoira_build_path).unwrap(); } let mut config = cmake::Config::new("ugoira"); - config.define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) + config + .define("CMAKE_INSTALL_PREFIX", out_path.to_str().unwrap()) .out_dir(ugoira_build_path) .define("UTILS_LIBRARY", utils_build_path.to_str().unwrap()); #[cfg(all(windows, target_env = "msvc"))] - config.define("CMAKE_BUILD_TYPE", "Release").generator("Ninja"); + config + .define("CMAKE_BUILD_TYPE", "Release") + .generator("Ninja"); config.build(); println!("cargo:rustc-link-search=native={}/lib", out_path.display()); let dep_path = out_path.join("ugoira_dep.txt"); diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..4afddff --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,3 @@ +ignore = [ + "src/settings_list.rs", +] diff --git a/src/data/exif.rs b/src/data/exif.rs index dcb8b15..90e3757 100644 --- a/src/data/exif.rs +++ b/src/data/exif.rs @@ -18,10 +18,7 @@ pub trait ExifDataSource { } impl ExifDataSource for std::sync::Arc { - call_parent_data_source_fun!( - "src/data/exif_data_source.json", - **self, - ); + call_parent_data_source_fun!("src/data/exif_data_source.json", **self,); } impl ExifDataSource for Option { diff --git a/src/fanbox/article/url_embed.rs b/src/fanbox/article/url_embed.rs index e4c0e67..84971c2 100644 --- a/src/fanbox/article/url_embed.rs +++ b/src/fanbox/article/url_embed.rs @@ -191,7 +191,10 @@ impl Debug for FanboxArticleUrlEmbedMap { fanbox_api_test!(test_html_card, { match client.get_post_info(4135937).await { Some(post) => { - assert_eq!(post.title(), Some("第255話 夏の新刊入稿しました!ジュエハキャラバンの話")); + assert_eq!( + post.title(), + Some("第255話 夏の新刊入稿しました!ジュエハキャラバンの話") + ); assert_eq!(post.creator_id(), Some("shiratamaco")); println!("{:#?}", post); match post.check_unknown() {