chore: update to dprint-core 0.63 (#92)

Cargo.toml

@@ -25,13 +25,13 @@ tracing = ["dprint-core/tracing"]
 
 [dependencies]
 anyhow = "1.0.64"
-dprint-core = { version = "0.62.0", features = ["formatting"] }
+dprint-core = { version = "0.63.3", features = ["formatting"] }
 pulldown-cmark = { version = "0.9.3", default-features = false }
 regex = "1"
 serde = { version = "1.0.144", features = ["derive"] }
 serde_json = { version = "1.0", optional = true }
 unicode-width = "0.1.10"
 
 [dev-dependencies]
-dprint-development = "0.9.1"
+dprint-development = "0.9.5"
 serde_json = { version = "1.0" }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.71.1"
+channel = "1.74.0"
 components = ["clippy"]

src/configuration/builder.rs

@@ -1,4 +1,3 @@
-use dprint_core::configuration::resolve_global_config;
 use dprint_core::configuration::ConfigKeyMap;
 use dprint_core::configuration::ConfigKeyValue;
 use dprint_core::configuration::GlobalConfiguration;
@@ -34,8 +33,7 @@ impl ConfigurationBuilder {
     if let Some(global_config) = &self.global_config {
       resolve_config(self.config.clone(), global_config).config
     } else {
-      let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
-      resolve_config(self.config.clone(), &global_config).config
+      resolve_config(self.config.clone(), &Default::default()).config
     }
   }
 
@@ -142,11 +140,7 @@ mod tests {
 
     let inner_config = config.get_inner_config();
     assert_eq!(inner_config.len(), 9);
-    let diagnostics = resolve_config(
-      inner_config,
-      &resolve_global_config(ConfigKeyMap::new(), &Default::default()).config,
-    )
-    .diagnostics;
+    let diagnostics = resolve_config(inner_config, &Default::default()).diagnostics;
     assert_eq!(diagnostics.len(), 0);
   }
 
@@ -156,7 +150,7 @@ mod tests {
     global_config.insert(String::from("lineWidth"), 90.into());
     global_config.insert(String::from("newLineKind"), "crlf".into());
     global_config.insert(String::from("useTabs"), true.into());
-    let global_config = resolve_global_config(global_config, &Default::default()).config;
+    let global_config = resolve_global_config(&mut global_config).config;
     let mut config_builder = ConfigurationBuilder::new();
     let config = config_builder.global_config(global_config).build();
     assert_eq!(config.line_width, 90);
@@ -165,7 +159,7 @@ mod tests {
 
   #[test]
   fn use_markdown_defaults_when_global_not_set() {
-    let global_config = resolve_global_config(ConfigKeyMap::new(), &Default::default()).config;
+    let global_config = GlobalConfiguration::default();
     let mut config_builder = ConfigurationBuilder::new();
     let config = config_builder.global_config(global_config).build();
     assert_eq!(config.line_width, 80); // this is different

src/configuration/resolve_config.rs

@@ -12,8 +12,8 @@ use dprint_core::configuration::*;
 /// use dprint_core::configuration::resolve_global_config;
 /// use dprint_plugin_markdown::configuration::resolve_config;
 ///
-/// let config_map = ConfigKeyMap::new(); // get a collection of key value pairs from somewhere
-/// let global_config_result = resolve_global_config(config_map, &Default::default());
+/// let mut config_map = ConfigKeyMap::new(); // get a collection of key value pairs from somewhere
+/// let global_config_result = resolve_global_config(&mut config_map);
 ///
 /// // check global_config_result.diagnostics here...
 ///

src/format_text.rs

@@ -2,7 +2,6 @@ use anyhow::bail;
 use anyhow::Result;
 use dprint_core::configuration::resolve_new_line_kind;
 use dprint_core::formatting::*;
-use dprint_core::plugins::FormatResult;
 
 use super::configuration::Configuration;
 use super::generation::file_has_ignore_file_directive;
@@ -17,8 +16,8 @@ use super::generation::Context;
 pub fn format_text(
   file_text: &str,
   config: &Configuration,
-  format_code_block_text: impl for<'a> FnMut(&str, &'a str, u32) -> FormatResult,
-) -> FormatResult {
+  format_code_block_text: impl for<'a> FnMut(&str, &'a str, u32) -> Result<Option<String>>,
+) -> Result<Option<String>> {
   let (source_file, markdown_text) = match parse_source_file(file_text, config)? {
     ParseFileResult::IgnoreFile => return Ok(None),
     ParseFileResult::SourceFile(file) => file,

src/generation/gen_types.rs

@@ -1,9 +1,11 @@
-use dprint_core::plugins::FormatResult;
 use regex::Regex;
 
 use super::utils::*;
 use crate::configuration::Configuration;
 use crate::format_text;
+use anyhow::Result;
+
+type FormatResult = Result<Option<String>>;
 
 pub struct Context<'a> {
   pub file_text: &'a str,