diff --git a/Cargo.lock b/Cargo.lock index 685cd3d..e49ff1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,11 +2,20 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "alejandra" +version = "1.5.0" +dependencies = [ + "mimalloc", + "rnix", + "rowan", +] + [[package]] name = "alejandra_cli" version = "1.5.0" dependencies = [ - "alejandra_engine", + "alejandra", "atty", "clap", "indoc", @@ -16,15 +25,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "alejandra_engine" -version = "1.5.0" -dependencies = [ - "mimalloc", - "rnix", - "rowan", -] - [[package]] name = "atty" version = "0.2.14" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" dependencies = [ "cfg-if", "once_cell", diff --git a/buildkite.yaml b/buildkite.yaml index 16db9a6..92d50fd 100644 --- a/buildkite.yaml +++ b/buildkite.yaml @@ -29,7 +29,7 @@ steps: - direnv allow - eval "$(direnv export bash)" - echo +++ Run tests - - cd src/alejandra_engine + - cd src/alejandra - cargo tarpaulin --coveralls "${COVERALLS_REPO_TOKEN}" - label: formatting diff diff --git a/front/Cargo.lock b/front/Cargo.lock index 89fc904..46cd29a 100644 --- a/front/Cargo.lock +++ b/front/Cargo.lock @@ -3,7 +3,7 @@ version = 3 [[package]] -name = "alejandra_engine" +name = "alejandra" version = "1.5.0" dependencies = [ "mimalloc", @@ -15,7 +15,7 @@ dependencies = [ name = "alejandra_front" version = "1.5.0" dependencies = [ - "alejandra_engine", + "alejandra", "console_error_panic_hook", "wasm-bindgen", "wee_alloc", diff --git a/front/Cargo.toml b/front/Cargo.toml index a8afbb6..b4ee9ac 100644 --- a/front/Cargo.toml +++ b/front/Cargo.toml @@ -1,5 +1,5 @@ [dependencies] -alejandra_engine = { "path" = "../src/alejandra_engine" } +alejandra = { "path" = "../src/alejandra" } console_error_panic_hook = "*" wasm-bindgen = "*" wee_alloc = "*" diff --git a/front/src/lib.rs b/front/src/lib.rs index e874fda..a9d0f93 100644 --- a/front/src/lib.rs +++ b/front/src/lib.rs @@ -12,5 +12,5 @@ pub fn main() -> Result<(), JsValue> { #[wasm_bindgen] pub fn format(before: String, path: String) -> String { - alejandra_engine::format::in_memory(path, before).1 + alejandra::format::in_memory(path, before).1 } diff --git a/src/alejandra_engine/Cargo.toml b/src/alejandra/Cargo.toml similarity index 86% rename from src/alejandra_engine/Cargo.toml rename to src/alejandra/Cargo.toml index b181cfa..93061b4 100644 --- a/src/alejandra_engine/Cargo.toml +++ b/src/alejandra/Cargo.toml @@ -1,36 +1,36 @@ [dependencies] -rnix = "*" +rnix = "0" rowan = "0.12.6" # follows rnix [target.aarch64-unknown-linux-musl.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [target.armv6l-unknown-linux-musleabihf.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [target.armv7l-unknown-linux-musleabihf.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [target.i686-unknown-linux-musl.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [target.x86_64-unknown-linux-gnu.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [target.x86_64-unknown-linux-musl.dependencies.mimalloc] default-features = false -version = "*" +version = "0" [package] authors = ["Kevin Amado "] description = "The Uncompromising Nix Code Formatter" edition = "2021" license = "Unlicense" -name = "alejandra_engine" +name = "alejandra" repository = "https://github.com/kamadorueda/alejandra" version = "1.5.0" diff --git a/src/alejandra_engine/src/builder.rs b/src/alejandra/src/builder.rs similarity index 100% rename from src/alejandra_engine/src/builder.rs rename to src/alejandra/src/builder.rs diff --git a/src/alejandra_engine/src/children.rs b/src/alejandra/src/children.rs similarity index 100% rename from src/alejandra_engine/src/children.rs rename to src/alejandra/src/children.rs diff --git a/src/alejandra_engine/src/children2.rs b/src/alejandra/src/children2.rs similarity index 100% rename from src/alejandra_engine/src/children2.rs rename to src/alejandra/src/children2.rs diff --git a/src/alejandra_engine/src/format.rs b/src/alejandra/src/format.rs similarity index 100% rename from src/alejandra_engine/src/format.rs rename to src/alejandra/src/format.rs diff --git a/src/alejandra_engine/src/lib.rs b/src/alejandra/src/lib.rs similarity index 100% rename from src/alejandra_engine/src/lib.rs rename to src/alejandra/src/lib.rs diff --git a/src/alejandra_engine/src/parsers/mod.rs b/src/alejandra/src/parsers/mod.rs similarity index 100% rename from src/alejandra_engine/src/parsers/mod.rs rename to src/alejandra/src/parsers/mod.rs diff --git a/src/alejandra_engine/src/parsers/pattern.rs b/src/alejandra/src/parsers/pattern.rs similarity index 100% rename from src/alejandra_engine/src/parsers/pattern.rs rename to src/alejandra/src/parsers/pattern.rs diff --git a/src/alejandra_engine/src/position.rs b/src/alejandra/src/position.rs similarity index 100% rename from src/alejandra_engine/src/position.rs rename to src/alejandra/src/position.rs diff --git a/src/alejandra_engine/src/rules/apply.rs b/src/alejandra/src/rules/apply.rs similarity index 100% rename from src/alejandra_engine/src/rules/apply.rs rename to src/alejandra/src/rules/apply.rs diff --git a/src/alejandra_engine/src/rules/attr_set.rs b/src/alejandra/src/rules/attr_set.rs similarity index 100% rename from src/alejandra_engine/src/rules/attr_set.rs rename to src/alejandra/src/rules/attr_set.rs diff --git a/src/alejandra_engine/src/rules/bin_op.rs b/src/alejandra/src/rules/bin_op.rs similarity index 100% rename from src/alejandra_engine/src/rules/bin_op.rs rename to src/alejandra/src/rules/bin_op.rs diff --git a/src/alejandra_engine/src/rules/dynamic.rs b/src/alejandra/src/rules/dynamic.rs similarity index 100% rename from src/alejandra_engine/src/rules/dynamic.rs rename to src/alejandra/src/rules/dynamic.rs diff --git a/src/alejandra_engine/src/rules/if_else.rs b/src/alejandra/src/rules/if_else.rs similarity index 100% rename from src/alejandra_engine/src/rules/if_else.rs rename to src/alejandra/src/rules/if_else.rs diff --git a/src/alejandra_engine/src/rules/inherit.rs b/src/alejandra/src/rules/inherit.rs similarity index 100% rename from src/alejandra_engine/src/rules/inherit.rs rename to src/alejandra/src/rules/inherit.rs diff --git a/src/alejandra_engine/src/rules/key_value.rs b/src/alejandra/src/rules/key_value.rs similarity index 100% rename from src/alejandra_engine/src/rules/key_value.rs rename to src/alejandra/src/rules/key_value.rs diff --git a/src/alejandra_engine/src/rules/lambda.rs b/src/alejandra/src/rules/lambda.rs similarity index 100% rename from src/alejandra_engine/src/rules/lambda.rs rename to src/alejandra/src/rules/lambda.rs diff --git a/src/alejandra_engine/src/rules/let_in.rs b/src/alejandra/src/rules/let_in.rs similarity index 100% rename from src/alejandra_engine/src/rules/let_in.rs rename to src/alejandra/src/rules/let_in.rs diff --git a/src/alejandra_engine/src/rules/list.rs b/src/alejandra/src/rules/list.rs similarity index 100% rename from src/alejandra_engine/src/rules/list.rs rename to src/alejandra/src/rules/list.rs diff --git a/src/alejandra_engine/src/rules/mod.rs b/src/alejandra/src/rules/mod.rs similarity index 100% rename from src/alejandra_engine/src/rules/mod.rs rename to src/alejandra/src/rules/mod.rs diff --git a/src/alejandra_engine/src/rules/paren.rs b/src/alejandra/src/rules/paren.rs similarity index 100% rename from src/alejandra_engine/src/rules/paren.rs rename to src/alejandra/src/rules/paren.rs diff --git a/src/alejandra_engine/src/rules/pat_bind.rs b/src/alejandra/src/rules/pat_bind.rs similarity index 100% rename from src/alejandra_engine/src/rules/pat_bind.rs rename to src/alejandra/src/rules/pat_bind.rs diff --git a/src/alejandra_engine/src/rules/pat_entry.rs b/src/alejandra/src/rules/pat_entry.rs similarity index 100% rename from src/alejandra_engine/src/rules/pat_entry.rs rename to src/alejandra/src/rules/pat_entry.rs diff --git a/src/alejandra_engine/src/rules/pattern.rs b/src/alejandra/src/rules/pattern.rs similarity index 100% rename from src/alejandra_engine/src/rules/pattern.rs rename to src/alejandra/src/rules/pattern.rs diff --git a/src/alejandra_engine/src/rules/root.rs b/src/alejandra/src/rules/root.rs similarity index 100% rename from src/alejandra_engine/src/rules/root.rs rename to src/alejandra/src/rules/root.rs diff --git a/src/alejandra_engine/src/rules/scoped.rs b/src/alejandra/src/rules/scoped.rs similarity index 100% rename from src/alejandra_engine/src/rules/scoped.rs rename to src/alejandra/src/rules/scoped.rs diff --git a/src/alejandra_engine/src/rules/select.rs b/src/alejandra/src/rules/select.rs similarity index 100% rename from src/alejandra_engine/src/rules/select.rs rename to src/alejandra/src/rules/select.rs diff --git a/src/alejandra_engine/src/rules/string.rs b/src/alejandra/src/rules/string.rs similarity index 100% rename from src/alejandra_engine/src/rules/string.rs rename to src/alejandra/src/rules/string.rs diff --git a/src/alejandra_engine/src/utils.rs b/src/alejandra/src/utils.rs similarity index 100% rename from src/alejandra_engine/src/utils.rs rename to src/alejandra/src/utils.rs diff --git a/src/alejandra_engine/src/version.rs b/src/alejandra/src/version.rs similarity index 100% rename from src/alejandra_engine/src/version.rs rename to src/alejandra/src/version.rs diff --git a/src/alejandra_engine/tests/cases/apply/in b/src/alejandra/tests/cases/apply/in similarity index 100% rename from src/alejandra_engine/tests/cases/apply/in rename to src/alejandra/tests/cases/apply/in diff --git a/src/alejandra_engine/tests/cases/apply/out b/src/alejandra/tests/cases/apply/out similarity index 100% rename from src/alejandra_engine/tests/cases/apply/out rename to src/alejandra/tests/cases/apply/out diff --git a/src/alejandra_engine/tests/cases/assert/in b/src/alejandra/tests/cases/assert/in similarity index 100% rename from src/alejandra_engine/tests/cases/assert/in rename to src/alejandra/tests/cases/assert/in diff --git a/src/alejandra_engine/tests/cases/assert/out b/src/alejandra/tests/cases/assert/out similarity index 100% rename from src/alejandra_engine/tests/cases/assert/out rename to src/alejandra/tests/cases/assert/out diff --git a/src/alejandra_engine/tests/cases/attr_set/in b/src/alejandra/tests/cases/attr_set/in similarity index 100% rename from src/alejandra_engine/tests/cases/attr_set/in rename to src/alejandra/tests/cases/attr_set/in diff --git a/src/alejandra_engine/tests/cases/attr_set/out b/src/alejandra/tests/cases/attr_set/out similarity index 100% rename from src/alejandra_engine/tests/cases/attr_set/out rename to src/alejandra/tests/cases/attr_set/out diff --git a/src/alejandra_engine/tests/cases/bin_op/in b/src/alejandra/tests/cases/bin_op/in similarity index 100% rename from src/alejandra_engine/tests/cases/bin_op/in rename to src/alejandra/tests/cases/bin_op/in diff --git a/src/alejandra_engine/tests/cases/bin_op/out b/src/alejandra/tests/cases/bin_op/out similarity index 100% rename from src/alejandra_engine/tests/cases/bin_op/out rename to src/alejandra/tests/cases/bin_op/out diff --git a/src/alejandra_engine/tests/cases/comment/in b/src/alejandra/tests/cases/comment/in similarity index 100% rename from src/alejandra_engine/tests/cases/comment/in rename to src/alejandra/tests/cases/comment/in diff --git a/src/alejandra_engine/tests/cases/comment/out b/src/alejandra/tests/cases/comment/out similarity index 100% rename from src/alejandra_engine/tests/cases/comment/out rename to src/alejandra/tests/cases/comment/out diff --git a/src/alejandra_engine/tests/cases/dynamic/in b/src/alejandra/tests/cases/dynamic/in similarity index 100% rename from src/alejandra_engine/tests/cases/dynamic/in rename to src/alejandra/tests/cases/dynamic/in diff --git a/src/alejandra_engine/tests/cases/dynamic/out b/src/alejandra/tests/cases/dynamic/out similarity index 100% rename from src/alejandra_engine/tests/cases/dynamic/out rename to src/alejandra/tests/cases/dynamic/out diff --git a/src/alejandra_engine/tests/cases/error/in b/src/alejandra/tests/cases/error/in similarity index 100% rename from src/alejandra_engine/tests/cases/error/in rename to src/alejandra/tests/cases/error/in diff --git a/src/alejandra_engine/tests/cases/error/out b/src/alejandra/tests/cases/error/out similarity index 100% rename from src/alejandra_engine/tests/cases/error/out rename to src/alejandra/tests/cases/error/out diff --git a/src/alejandra_engine/tests/cases/idioms/in b/src/alejandra/tests/cases/idioms/in similarity index 100% rename from src/alejandra_engine/tests/cases/idioms/in rename to src/alejandra/tests/cases/idioms/in diff --git a/src/alejandra_engine/tests/cases/idioms/out b/src/alejandra/tests/cases/idioms/out similarity index 100% rename from src/alejandra_engine/tests/cases/idioms/out rename to src/alejandra/tests/cases/idioms/out diff --git a/src/alejandra_engine/tests/cases/idioms_lib_1/in b/src/alejandra/tests/cases/idioms_lib_1/in similarity index 100% rename from src/alejandra_engine/tests/cases/idioms_lib_1/in rename to src/alejandra/tests/cases/idioms_lib_1/in diff --git a/src/alejandra_engine/tests/cases/idioms_lib_1/out b/src/alejandra/tests/cases/idioms_lib_1/out similarity index 100% rename from src/alejandra_engine/tests/cases/idioms_lib_1/out rename to src/alejandra/tests/cases/idioms_lib_1/out diff --git a/src/alejandra_engine/tests/cases/idioms_pkgs_1/in b/src/alejandra/tests/cases/idioms_pkgs_1/in similarity index 100% rename from src/alejandra_engine/tests/cases/idioms_pkgs_1/in rename to src/alejandra/tests/cases/idioms_pkgs_1/in diff --git a/src/alejandra_engine/tests/cases/idioms_pkgs_1/out b/src/alejandra/tests/cases/idioms_pkgs_1/out similarity index 100% rename from src/alejandra_engine/tests/cases/idioms_pkgs_1/out rename to src/alejandra/tests/cases/idioms_pkgs_1/out diff --git a/src/alejandra_engine/tests/cases/if_else/in b/src/alejandra/tests/cases/if_else/in similarity index 100% rename from src/alejandra_engine/tests/cases/if_else/in rename to src/alejandra/tests/cases/if_else/in diff --git a/src/alejandra_engine/tests/cases/if_else/out b/src/alejandra/tests/cases/if_else/out similarity index 100% rename from src/alejandra_engine/tests/cases/if_else/out rename to src/alejandra/tests/cases/if_else/out diff --git a/src/alejandra_engine/tests/cases/inherit/in b/src/alejandra/tests/cases/inherit/in similarity index 100% rename from src/alejandra_engine/tests/cases/inherit/in rename to src/alejandra/tests/cases/inherit/in diff --git a/src/alejandra_engine/tests/cases/inherit/out b/src/alejandra/tests/cases/inherit/out similarity index 100% rename from src/alejandra_engine/tests/cases/inherit/out rename to src/alejandra/tests/cases/inherit/out diff --git a/src/alejandra_engine/tests/cases/inherit_from/in b/src/alejandra/tests/cases/inherit_from/in similarity index 100% rename from src/alejandra_engine/tests/cases/inherit_from/in rename to src/alejandra/tests/cases/inherit_from/in diff --git a/src/alejandra_engine/tests/cases/inherit_from/out b/src/alejandra/tests/cases/inherit_from/out similarity index 100% rename from src/alejandra_engine/tests/cases/inherit_from/out rename to src/alejandra/tests/cases/inherit_from/out diff --git a/src/alejandra_engine/tests/cases/key_value/in b/src/alejandra/tests/cases/key_value/in similarity index 100% rename from src/alejandra_engine/tests/cases/key_value/in rename to src/alejandra/tests/cases/key_value/in diff --git a/src/alejandra_engine/tests/cases/key_value/out b/src/alejandra/tests/cases/key_value/out similarity index 100% rename from src/alejandra_engine/tests/cases/key_value/out rename to src/alejandra/tests/cases/key_value/out diff --git a/src/alejandra_engine/tests/cases/lambda/in b/src/alejandra/tests/cases/lambda/in similarity index 100% rename from src/alejandra_engine/tests/cases/lambda/in rename to src/alejandra/tests/cases/lambda/in diff --git a/src/alejandra_engine/tests/cases/lambda/out b/src/alejandra/tests/cases/lambda/out similarity index 100% rename from src/alejandra_engine/tests/cases/lambda/out rename to src/alejandra/tests/cases/lambda/out diff --git a/src/alejandra_engine/tests/cases/let_in/in b/src/alejandra/tests/cases/let_in/in similarity index 100% rename from src/alejandra_engine/tests/cases/let_in/in rename to src/alejandra/tests/cases/let_in/in diff --git a/src/alejandra_engine/tests/cases/let_in/out b/src/alejandra/tests/cases/let_in/out similarity index 100% rename from src/alejandra_engine/tests/cases/let_in/out rename to src/alejandra/tests/cases/let_in/out diff --git a/src/alejandra_engine/tests/cases/lists/in b/src/alejandra/tests/cases/lists/in similarity index 100% rename from src/alejandra_engine/tests/cases/lists/in rename to src/alejandra/tests/cases/lists/in diff --git a/src/alejandra_engine/tests/cases/lists/out b/src/alejandra/tests/cases/lists/out similarity index 100% rename from src/alejandra_engine/tests/cases/lists/out rename to src/alejandra/tests/cases/lists/out diff --git a/src/alejandra_engine/tests/cases/or_default/in b/src/alejandra/tests/cases/or_default/in similarity index 100% rename from src/alejandra_engine/tests/cases/or_default/in rename to src/alejandra/tests/cases/or_default/in diff --git a/src/alejandra_engine/tests/cases/or_default/out b/src/alejandra/tests/cases/or_default/out similarity index 100% rename from src/alejandra_engine/tests/cases/or_default/out rename to src/alejandra/tests/cases/or_default/out diff --git a/src/alejandra_engine/tests/cases/paren/in b/src/alejandra/tests/cases/paren/in similarity index 100% rename from src/alejandra_engine/tests/cases/paren/in rename to src/alejandra/tests/cases/paren/in diff --git a/src/alejandra_engine/tests/cases/paren/out b/src/alejandra/tests/cases/paren/out similarity index 100% rename from src/alejandra_engine/tests/cases/paren/out rename to src/alejandra/tests/cases/paren/out diff --git a/src/alejandra_engine/tests/cases/pat_bind/in b/src/alejandra/tests/cases/pat_bind/in similarity index 100% rename from src/alejandra_engine/tests/cases/pat_bind/in rename to src/alejandra/tests/cases/pat_bind/in diff --git a/src/alejandra_engine/tests/cases/pat_bind/out b/src/alejandra/tests/cases/pat_bind/out similarity index 100% rename from src/alejandra_engine/tests/cases/pat_bind/out rename to src/alejandra/tests/cases/pat_bind/out diff --git a/src/alejandra_engine/tests/cases/pattern/in b/src/alejandra/tests/cases/pattern/in similarity index 100% rename from src/alejandra_engine/tests/cases/pattern/in rename to src/alejandra/tests/cases/pattern/in diff --git a/src/alejandra_engine/tests/cases/pattern/out b/src/alejandra/tests/cases/pattern/out similarity index 100% rename from src/alejandra_engine/tests/cases/pattern/out rename to src/alejandra/tests/cases/pattern/out diff --git a/src/alejandra_engine/tests/cases/root/in b/src/alejandra/tests/cases/root/in similarity index 100% rename from src/alejandra_engine/tests/cases/root/in rename to src/alejandra/tests/cases/root/in diff --git a/src/alejandra_engine/tests/cases/root/out b/src/alejandra/tests/cases/root/out similarity index 100% rename from src/alejandra_engine/tests/cases/root/out rename to src/alejandra/tests/cases/root/out diff --git a/src/alejandra_engine/tests/cases/select/in b/src/alejandra/tests/cases/select/in similarity index 100% rename from src/alejandra_engine/tests/cases/select/in rename to src/alejandra/tests/cases/select/in diff --git a/src/alejandra_engine/tests/cases/select/out b/src/alejandra/tests/cases/select/out similarity index 100% rename from src/alejandra_engine/tests/cases/select/out rename to src/alejandra/tests/cases/select/out diff --git a/src/alejandra_engine/tests/cases/string/in b/src/alejandra/tests/cases/string/in similarity index 100% rename from src/alejandra_engine/tests/cases/string/in rename to src/alejandra/tests/cases/string/in diff --git a/src/alejandra_engine/tests/cases/string/out b/src/alejandra/tests/cases/string/out similarity index 100% rename from src/alejandra_engine/tests/cases/string/out rename to src/alejandra/tests/cases/string/out diff --git a/src/alejandra_engine/tests/cases/string_interpol/in b/src/alejandra/tests/cases/string_interpol/in similarity index 100% rename from src/alejandra_engine/tests/cases/string_interpol/in rename to src/alejandra/tests/cases/string_interpol/in diff --git a/src/alejandra_engine/tests/cases/string_interpol/out b/src/alejandra/tests/cases/string_interpol/out similarity index 100% rename from src/alejandra_engine/tests/cases/string_interpol/out rename to src/alejandra/tests/cases/string_interpol/out diff --git a/src/alejandra_engine/tests/cases/with/in b/src/alejandra/tests/cases/with/in similarity index 100% rename from src/alejandra_engine/tests/cases/with/in rename to src/alejandra/tests/cases/with/in diff --git a/src/alejandra_engine/tests/cases/with/out b/src/alejandra/tests/cases/with/out similarity index 100% rename from src/alejandra_engine/tests/cases/with/out rename to src/alejandra/tests/cases/with/out diff --git a/src/alejandra_engine/tests/fmt.rs b/src/alejandra/tests/fmt.rs similarity index 91% rename from src/alejandra_engine/tests/fmt.rs rename to src/alejandra/tests/fmt.rs index 3ab6778..b947c4e 100644 --- a/src/alejandra_engine/tests/fmt.rs +++ b/src/alejandra/tests/fmt.rs @@ -15,7 +15,7 @@ fn cases() { let path_out = format!("tests/cases/{}/out", case); let content_in = std::fs::read_to_string(path_in.clone()).unwrap(); let content_got = - alejandra_engine::format::in_memory(path_in, content_in.clone()).1; + alejandra::format::in_memory(path_in, content_in.clone()).1; if should_update { std::fs::File::create(&path_out) diff --git a/src/alejandra_cli/Cargo.toml b/src/alejandra_cli/Cargo.toml index 21e9a24..353fd16 100644 --- a/src/alejandra_cli/Cargo.toml +++ b/src/alejandra_cli/Cargo.toml @@ -3,7 +3,7 @@ name = "alejandra" path = "src/main.rs" [dependencies] -alejandra_engine = { path = "../alejandra_engine" } +alejandra = { path = "../alejandra" } atty = "*" clap = "*" indoc = "*" diff --git a/src/alejandra_cli/src/cli.rs b/src/alejandra_cli/src/cli.rs index 080167f..0003632 100644 --- a/src/alejandra_cli/src/cli.rs +++ b/src/alejandra_cli/src/cli.rs @@ -1,13 +1,13 @@ #[derive(Clone)] pub(crate) struct FormattedPath { pub path: String, - pub status: alejandra_engine::format::Status, + pub status: alejandra::format::Status, } pub(crate) fn parse(args: Vec) -> clap::ArgMatches { clap::Command::new("Alejandra") .about("The Uncompromising Nix Code Formatter.") - .version(alejandra_engine::version::VERSION) + .version(alejandra::version::VERSION) .arg( clap::Arg::new("include") .help("Files or directories, or none to format stdin.") @@ -78,7 +78,7 @@ pub(crate) fn stdin(quiet: bool) -> FormattedPath { std::io::stdin().read_to_string(&mut before).unwrap(); let (status, data) = - alejandra_engine::format::in_memory(path.clone(), before.clone()); + alejandra::format::in_memory(path.clone(), before.clone()); print!("{}", data); @@ -100,9 +100,9 @@ pub(crate) fn simple( .par_iter() .map(|path| { let status = - alejandra_engine::format::in_fs(path.clone(), in_place); + alejandra::format::in_fs(path.clone(), in_place); - if let alejandra_engine::format::Status::Changed(changed) = status { + if let alejandra::format::Status::Changed(changed) = status { if changed && !quiet { if in_place { eprintln!("Changed: {}", &path); @@ -172,7 +172,7 @@ pub(crate) fn tui( std::thread::spawn(move || { paths.into_par_iter().for_each_with(sender_paths, |sender, path| { let status = - alejandra_engine::format::in_fs(path.clone(), in_place); + alejandra::format::in_fs(path.clone(), in_place); if let Err(error) = sender .send(Event::FormattedPath(FormattedPath { path, status })) @@ -197,7 +197,7 @@ pub(crate) fn tui( match event { Event::FormattedPath(formatted_path) => { match &formatted_path.status { - alejandra_engine::format::Status::Changed( + alejandra::format::Status::Changed( changed, ) => { if *changed { @@ -206,7 +206,7 @@ pub(crate) fn tui( paths_unchanged += 1; } } - alejandra_engine::format::Status::Error(_) => { + alejandra::format::Status::Error(_) => { paths_with_errors += 1; } }; @@ -250,7 +250,7 @@ pub(crate) fn tui( .fg(tui::style::Color::Green), ), tui::text::Span::raw(" "), - tui::text::Span::raw(alejandra_engine::version::VERSION), + tui::text::Span::raw(alejandra::version::VERSION), ]), tui::text::Spans::from(vec![tui::text::Span::raw( "The Uncompromising Nix Code Formatter", @@ -304,7 +304,7 @@ pub(crate) fn tui( .map(|formatted_path| { tui::text::Spans::from(vec![ match formatted_path.status { - alejandra_engine::format::Status::Changed( + alejandra::format::Status::Changed( changed, ) => tui::text::Span::styled( if changed { @@ -319,7 +319,7 @@ pub(crate) fn tui( tui::style::Style::default() .fg(tui::style::Color::Green), ), - alejandra_engine::format::Status::Error(_) => { + alejandra::format::Status::Error(_) => { tui::text::Span::styled( "ERROR ", tui::style::Style::default() @@ -389,7 +389,7 @@ pub fn main() -> std::io::Result<()> { .filter(|formatted_path| { matches!( formatted_path.status, - alejandra_engine::format::Status::Error(_) + alejandra::format::Status::Error(_) ) }) .count(); @@ -402,7 +402,7 @@ pub fn main() -> std::io::Result<()> { if errors >= 2 { "s" } else { "" } ); for formatted_path in formatted_paths { - if let alejandra_engine::format::Status::Error(error) = + if let alejandra::format::Status::Error(error) = formatted_path.status { eprintln!(" {}: {}", formatted_path.path, &error); @@ -414,7 +414,7 @@ pub fn main() -> std::io::Result<()> { let changed = formatted_paths .iter() .filter(|formatted_path| match formatted_path.status { - alejandra_engine::format::Status::Changed(changed) => changed, + alejandra::format::Status::Changed(changed) => changed, _ => false, }) .count();