From bbc000240ac6a52c3dbbd6340382d7559a3d4564 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Sat, 11 Jun 2022 10:39:49 -0400 Subject: [PATCH] chore: update dprint-core to 0.58.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/configuration/resolve_config.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35832ba..e2dc383 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "dprint-core" -version = "0.55.0" +version = "0.58.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb98d240e58a9b47037f01c585bf1c91858ba8412e38283e004cb847377ce56e" +checksum = "4d4eb65949e6ff07306d8b85f5b95414d6384a0fd5bb130477a9e0f1dbdc17d6" dependencies = [ "anyhow", "bumpalo", diff --git a/Cargo.toml b/Cargo.toml index a0dadf2..0018cd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ tracing = ["dprint-core/tracing"] [dependencies] anyhow = "1.0.51" dockerfile-parser = "0.8.0" -dprint-core = { version = "0.55.0", features = ["formatting"] } +dprint-core = { version = "0.58.2", features = ["formatting"] } serde = { version = "1.0.88", features = ["derive"] } serde_json = { version = "1.0", optional = true } diff --git a/src/configuration/resolve_config.rs b/src/configuration/resolve_config.rs index ba67b46..d843b66 100644 --- a/src/configuration/resolve_config.rs +++ b/src/configuration/resolve_config.rs @@ -31,13 +31,13 @@ pub fn resolve_config(config: ConfigKeyMap, global_config: &GlobalConfiguration) line_width: get_value( &mut config, "lineWidth", - global_config.line_width.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.line_width), + global_config.line_width.unwrap_or(RECOMMENDED_GLOBAL_CONFIGURATION.line_width), &mut diagnostics, ), new_line_kind: get_value( &mut config, "newLineKind", - global_config.new_line_kind.unwrap_or(DEFAULT_GLOBAL_CONFIGURATION.new_line_kind), + global_config.new_line_kind.unwrap_or(RECOMMENDED_GLOBAL_CONFIGURATION.new_line_kind), &mut diagnostics, ), };