diff --git a/.rustfmt.toml b/.rustfmt.toml index bf2e23a2e4..3eb0b6dbeb 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -1,3 +1,4 @@ +# When updating, also update `rust_format::Config` in `node/build.rs` indent_style = "Block" imports_granularity = "Crate" reorder_imports = true diff --git a/node/build.rs b/node/build.rs index a691c8da8d..ee8e226a2f 100644 --- a/node/build.rs +++ b/node/build.rs @@ -10,7 +10,7 @@ use std::{ }; use regex::Regex; -use rust_format::Formatter; +use rust_format::{Edition, Formatter}; fn visit_dirs(dir: &PathBuf, cb: &mut dyn FnMut(&DirEntry)) -> io::Result<()> { if dir.is_dir() { @@ -355,7 +355,15 @@ fn main() -> Result<(), Box> { let tmp_path = PathBuf::from(std::env::var("OUT_DIR").unwrap()).join("action_kind.rs"); fs::write(&tmp_path, contents)?; - rust_format::RustFmt::default() + + // This should be same as `.rustfmt.toml` + let config = rust_format::Config::new_str() + .edition(Edition::Rust2021) + .option("indent_style", "Block") + .option("imports_granularity", "Crate") + .option("reorder_imports", "true"); + + rust_format::RustFmt::from_config(config) .format_file(&tmp_path) .expect("failed to format generated file");