Merge pull request #2397 from brandonweeks/codespan

Bump codespan to version 0.13

Author: yannham

Cargo.lock

@@ -50,8 +50,8 @@ assert_matches = "1.5.0"
 bincode = "2.0"
 clap = "4.5"
 clap_complete = "4.5"
-codespan = { version = "0.12", features = ["serialization"] }
-codespan-reporting = { version = "0.12", features = ["serialization"] }
+codespan = { version = "0.13", features = ["serialization"] }
+codespan-reporting = { version = "0.13", features = ["serialization"] }
 colorchoice = "1.0"
 comrak = "0.36"
 criterion = "0.5"

Cargo.toml

@@ -122,7 +122,8 @@ pub fn report_with<E: IntoDiagnostics>(
 
     let result = match format {
         ErrorFormat::Text => diagnostics.iter().try_for_each(|d| {
-            codespan_reporting::term::emit(writer, &config, files, d).map_err(|err| err.to_string())
+            codespan_reporting::term::emit_to_write_style(writer, &config, files, d)
+                .map_err(|err| err.to_string())
         }),
         ErrorFormat::Json => serde_json::to_writer(stderr, &DiagnosticsWrapper::from(diagnostics))
             .map(|_| eprintln!())

core/src/error/report.rs

@@ -314,7 +314,9 @@ pub fn diags_to_string(files: &Files, diags: &[Diagnostic<FileId>]) -> String {
 
     diags
         .iter()
-        .try_for_each(|d| codespan_reporting::term::emit(&mut buffer, &config, files, d))
+        .try_for_each(|d| {
+            codespan_reporting::term::emit_to_write_style(&mut buffer, &config, files, d)
+        })
         .unwrap();
 
     String::from_utf8(buffer.into_inner().into_inner()).unwrap()

core/src/repl/wasm_frontend.rs

@@ -134,7 +134,7 @@ impl Error {
                 };
                 let config = codespan_reporting::term::Config::default();
                 diagnostics.diagnostics.iter().try_for_each(|d| {
-                    Ok(codespan_reporting::term::emit(
+                    Ok(codespan_reporting::term::emit_to_write_style(
                         writer, &config, &err.files, d,
                     )?)
                 })