chore: Update dprint core.

Author: dsherret

Cargo.lock

@@ -21,10 +21,10 @@ overflow-checks = false
 panic = "abort"
 
 [features]
-wasm = ["serde_json"]
+wasm = ["serde_json", "dprint-core/wasm"]
 
 [dependencies]
-dprint-core = "0.24.1"
+dprint-core = { version = "0.25.0", features = ["formatting"] }
 swc_common = "=0.8.0"
 swc_ecmascript = { version = "=0.1.0", features = ["parser"] }
 serde = { version = "1.0.88", features = ["derive"] }

Cargo.toml

@@ -1,4 +1,4 @@
-use dprint_core::*;
+use dprint_core::formatting::*;
 use dprint_core::configuration::{resolve_new_line_kind};
 use std::path::PathBuf;
 use super::parsing::parse;

src/formatter.rs

@@ -1,6 +1,6 @@
 use std::rc::Rc;
-use dprint_core::*;
-use dprint_core::{parser_helpers::*,condition_resolvers, conditions::*};
+use dprint_core::formatting::*;
+use dprint_core::formatting::{parser_helpers::*,condition_resolvers, conditions::*};
 use swc_ecmascript::ast::*;
 use swc_common::{comments::{Comment, CommentKind}, BytePos, Span, Spanned};
 use swc_ecmascript::parser::{token::{TokenAndSpan}};

src/parsing/parser.rs

@@ -1,6 +1,6 @@
 use std::str;
 use std::collections::{HashSet, HashMap};
-use dprint_core::{Info, ConditionReference};
+use dprint_core::formatting::{Info, ConditionReference};
 use swc_common::{BytePos, comments::{Comment, CommentKind}, SourceFile, Spanned, Span};
 use swc_ecmascript::ast::*;
 use swc_ecmascript::parser::{token::TokenAndSpan};

src/parsing/parser_types.rs

@@ -2,7 +2,7 @@ use std::str;
 use super::*;
 use swc_common::{BytePos, Span};
 use swc_ecmascript::parser::{token::{Token, TokenAndSpan}};
-use dprint_core::tokens::{TokenFinder as CoreTokenFinder, TokenCollection};
+use dprint_core::formatting::tokens::{TokenFinder as CoreTokenFinder, TokenCollection};
 
 pub struct TokenFinder<'a> {
     inner: CoreTokenFinder<LocalTokenCollection<'a>>,

src/parsing/tokens.rs

@@ -37,7 +37,7 @@ pub fn parse_swc_ast<'a>(file_path: &PathBuf, file_text: &'a str) -> Result<Pars
 
 fn parse_inner<'a>(file_path: &PathBuf, file_text: &'a str) -> Result<ParsedSourceFile<'a>, String> {
     let handler = Handler::with_emitter(false, false, Box::new(EmptyEmitter {}));
-    
+
     let file_bytes = file_text.as_bytes();
     let source_file = SourceFile::new(
         FileName::Custom(file_path.to_string_lossy().into()),
@@ -125,7 +125,7 @@ impl Emitter for EmptyEmitter {
 
 fn format_diagnostic(error: &DiagnosticBuilder, file_text: &str) -> String {
     // todo: handling sub diagnostics?
-    dprint_core::utils::string_utils::format_diagnostic(
+    dprint_core::formatting::utils::string_utils::format_diagnostic(
         error.span.primary_span().map(|span| (span.lo().0 as usize, span.hi().0 as usize)),
         &error.message(),
         file_text