Merge #849

849: feat: Update to codespan_reporting 0.9 r=Marwes a=Marwes



Co-authored-by: Markus Westerlind <[email protected]>
Co-authored-by: Markus Westerlind <[email protected]>

Author: 3 people

Cargo.lock

@@ -38,10 +38,10 @@ log = "0.4"
 quick-error = "1.0.0"
 collect-mac = "0.1.0"
 either = "1.0.0"
-itertools = "0.8"
+itertools = "0.9"
 futures = { version = "0.3.1", features = ["thread-pool"] }
-codespan = "0.3"
-codespan-reporting = "0.3"
+codespan = "0.9"
+codespan-reporting = "0.9"
 pin-project = "0.4"
 salsa = { version = "0.14.0", package = "gluon-salsa" }
 
@@ -61,7 +61,7 @@ native-tls = { version = "0.2", optional = true }
 tokio-tls = { version = "0.3", optional = true }
 
 # Crates used in testing
-compiletest_rs = { version = "0.3.23", optional = true }
+compiletest_rs = { version = "0.5", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 rand = { version = "0.7", optional = true }
@@ -70,7 +70,7 @@ rand_xorshift = { version = "0.2", optional = true }
 [build-dependencies]
 gluon_base = { path = "base", version = "0.15.1" } # GLUON
 
-itertools = "0.8"
+itertools = "0.9"
 little-skeptic = { version = "0.15.0", optional = true }
 walkdir = "2"
 
@@ -80,6 +80,7 @@ collect-mac = "0.1.0"
 env_logger = "0.7"
 failure = "0.1"
 failure_derive = "0.1"
+insta = "0.16"
 pretty_assertions = "0.6"
 structopt = "0.3"
 tempfile = "3.0.4"
@@ -93,7 +94,7 @@ serde_derive_state = { version = "0.4.0" }
 serde_json = "1.0.0"
 bincode = "1"
 
-pulldown-cmark = "0.6"
+pulldown-cmark = "0.7"
 
 gluon_completion = { path = "completion", version = "0.15.1" } # GLUON
 gluon_codegen = { path = "codegen", version = "0.15.1" } # GLUON
@@ -147,4 +148,4 @@ features = ["docs_rs"]
 # debug = 2
 #
 # [profile.release]
-# debug = 2
+# debug = 2

Cargo.toml

@@ -25,10 +25,10 @@ pretty = "0.10"
 smallvec = "0.6"
 collect-mac = "0.1.0"
 anymap = "0.12.0"
-itertools = "0.8"
+itertools = "0.9"
 ordered-float = "1"
-codespan = "0.3"
-codespan-reporting = "0.3"
+codespan = "0.9"
+codespan-reporting = "0.9"
 either = "1"
 vec_map = "0.8"
 typed-arena = "1"
@@ -41,7 +41,7 @@ serde_derive = { version = "1.0.0", optional = true }
 serde_derive_state = { version = "0.4.0", optional = true }
 
 # Crates used in testing
-compiletest_rs = { version = "0.3.23", optional = true }
+compiletest_rs = { version = "0.5", optional = true }
 
 [dev-dependencies]
 env_logger = "0.7"

base/Cargo.toml

@@ -11,9 +11,12 @@ use std::slice;
 use std::str;
 use std::vec;
 
-use codespan_reporting::{Diagnostic, Label};
+use codespan_reporting::diagnostic::{Diagnostic, Label};
 
-use crate::pos::{BytePos, Span, Spanned};
+use crate::{
+    pos::{BytePos, Spanned},
+    source::FileId,
+};
 
 /// An error type which can represent multiple errors.
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
@@ -155,7 +158,7 @@ impl<T: fmt::Display + fmt::Debug + Any> StdError for Errors<T> {
 /// Error type which contains information of which file and where in the file the error occurred
 #[derive(Clone, Debug)]
 pub struct InFile<E> {
-    source: ::codespan::CodeMap,
+    source: crate::source::CodeMap,
     error: Errors<Spanned<E, BytePos>>,
 }
 
@@ -186,7 +189,7 @@ where
 impl<E: fmt::Display> InFile<E> {
     /// Creates a new `InFile` error which states that the error occurred in `file` using the file
     /// contents in `source` to provide a context to the span.
-    pub fn new(source: ::codespan::CodeMap, error: Errors<Spanned<E, BytePos>>) -> InFile<E> {
+    pub fn new(source: crate::source::CodeMap, error: Errors<Spanned<E, BytePos>>) -> InFile<E> {
         let err = InFile { source, error };
         // Verify that the source name can be accessed
         debug_assert!({
@@ -196,9 +199,9 @@ impl<E: fmt::Display> InFile<E> {
         err
     }
 
-    pub fn source_name(&self) -> &::codespan::FileName {
+    pub fn source_name(&self) -> &str {
         self.source
-            .find_file(self.error[0].span.start())
+            .get(self.error[0].span.start())
             .unwrap_or_else(|| {
                 panic!(
                     "Source file does not exist in associated code map. Error: {}",
@@ -221,27 +224,34 @@ impl<E: fmt::Display> InFile<E> {
         E: AsDiagnostic,
     {
         let mut output = Vec::new();
-        self.emit(
-            &mut ::codespan_reporting::termcolor::NoColor::new(&mut output),
-        )?;
+        self.emit(&mut ::codespan_reporting::term::termcolor::NoColor::new(
+            &mut output,
+        ))?;
         Ok(String::from_utf8(output).unwrap())
     }
 
-    pub fn emit<W>(&self, writer: &mut W) -> io::Result<()>
+    pub fn emit(
+        &self,
+        writer: &mut dyn ::codespan_reporting::term::termcolor::WriteColor,
+    ) -> io::Result<()>
     where
-        W: ?Sized + ::codespan_reporting::termcolor::WriteColor,
         E: AsDiagnostic,
     {
         let iter = self
             .error
             .iter()
-            .map(AsDiagnostic::as_diagnostic)
+            .map(|error| error.as_diagnostic(&self.source))
             .enumerate();
         for (i, diagnostic) in iter {
             if i != 0 {
                 writeln!(writer)?;
             }
-            ::codespan_reporting::emit(&mut *writer, &self.source, &diagnostic)?;
+            ::codespan_reporting::term::emit(
+                &mut *writer,
+                &Default::default(),
+                &self.source,
+                &diagnostic,
+            )?;
         }
         Ok(())
     }
@@ -251,10 +261,9 @@ impl<E: fmt::Display + AsDiagnostic> fmt::Display for InFile<E> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let mut buffer = Vec::new();
         {
-            let mut writer = ::codespan_reporting::termcolor::NoColor::new(&mut buffer);
+            let mut writer = ::codespan_reporting::term::termcolor::NoColor::new(&mut buffer);
 
-            self.emit(&mut writer)
-                .map_err(|_| fmt::Error)?;
+            self.emit(&mut writer).map_err(|_| fmt::Error)?;
         }
 
         write!(f, "{}", str::from_utf8(&buffer).unwrap())
@@ -295,16 +304,32 @@ impl<E, H> From<E> for Help<E, H> {
 }
 
 pub trait AsDiagnostic {
-    fn as_diagnostic(&self) -> Diagnostic;
+    fn as_diagnostic(&self, map: &crate::source::CodeMap) -> Diagnostic<FileId>;
 }
 
 impl<E> AsDiagnostic for Spanned<E, BytePos>
 where
     E: AsDiagnostic,
 {
-    fn as_diagnostic(&self) -> Diagnostic {
-        let mut diagnostic = self.value.as_diagnostic();
-        diagnostic.labels.insert(0, Label::new_primary(self.span));
+    fn as_diagnostic(&self, map: &crate::source::CodeMap) -> Diagnostic<FileId> {
+        let mut diagnostic = self.value.as_diagnostic(map);
+        for label in &mut diagnostic.labels {
+            if label.file_id == FileId::default() {
+                label.file_id = self.span.start();
+            }
+            if label.range == (0..0) {
+                if let Some(range) = self.span.to_range(map) {
+                    label.range = range;
+                }
+            }
+        }
+        if diagnostic.labels.is_empty() {
+            if let Some(range) = self.span.to_range(map) {
+                diagnostic
+                    .labels
+                    .push(Label::primary(self.span.start(), range));
+            }
+        }
         diagnostic
     }
 }
@@ -314,20 +339,27 @@ where
     E: AsDiagnostic,
     H: fmt::Display,
 {
-    fn as_diagnostic(&self) -> Diagnostic {
-        let mut diagnostic = self.error.as_diagnostic();
+    fn as_diagnostic(&self, map: &crate::source::CodeMap) -> Diagnostic<FileId> {
+        let mut diagnostic = self.error.as_diagnostic(map);
         if let Some(ref help) = self.help {
             diagnostic.labels.push(
-                Label::new_secondary(Span::new(BytePos::none(), BytePos::none()))
-                    .with_message(help.to_string()),
+                Label::secondary(
+                    diagnostic
+                        .labels
+                        .last()
+                        .map(|label| label.file_id)
+                        .unwrap_or_default(),
+                    0..0,
+                )
+                .with_message(help.to_string()),
             );
         }
         diagnostic
     }
 }
 
 impl AsDiagnostic for Box<dyn ::std::error::Error + Send + Sync> {
-    fn as_diagnostic(&self) -> Diagnostic {
-        Diagnostic::new_error(self.to_string())
+    fn as_diagnostic(&self, _map: &crate::source::CodeMap) -> Diagnostic<FileId> {
+        Diagnostic::error().with_message(self.to_string())
     }
 }