chore(deps): update rust crate ariadne to 0.4.0 (#793)

* chore(deps): update rust crate ariadne to 0.4.0

* Specify ariadne storage type

---------

Co-authored-by: renovate[bot] <[email protected]>
Co-authored-by: Renée Kooi <[email protected]>

Author: 3 people

crates/apollo-compiler/Cargo.toml

@@ -19,7 +19,7 @@ autotests = false # Most tests/*.rs files are modules of tests/main.rs
 
 [dependencies]
 apollo-parser = { path = "../apollo-parser", version = "0.7.4" }
-ariadne = { version = "0.3.0", features = ["auto-color"] }
+ariadne = { version = "0.4.0", features = ["auto-color"] }
 indexmap = "2.0.0"
 rowan = "0.15.5"
 salsa = "0.16.1"

crates/apollo-compiler/src/diagnostic.rs

@@ -279,6 +279,8 @@ impl<'s> CliReport<'s> {
 struct Cache<'a>(&'a SourceMap);
 
 impl ariadne::Cache<FileId> for Cache<'_> {
+    type Storage = String;
+
     fn fetch(&mut self, file_id: &FileId) -> Result<&ariadne::Source, Box<dyn fmt::Debug + '_>> {
         struct NotFound(FileId);
         impl fmt::Debug for NotFound {
@@ -290,7 +292,7 @@ impl ariadne::Cache<FileId> for Cache<'_> {
             Ok(source_file.ariadne())
         } else if *file_id == FileId::NONE || *file_id == FileId::HACK_TMP {
             static EMPTY: OnceLock<ariadne::Source> = OnceLock::new();
-            Ok(EMPTY.get_or_init(|| ariadne::Source::from("")))
+            Ok(EMPTY.get_or_init(|| ariadne::Source::from(String::new())))
         } else {
             Err(Box::new(NotFound(*file_id)))
         }

crates/apollo-compiler/src/parser.rs

@@ -352,7 +352,9 @@ impl Parser {
 
 impl MappedSource {
     fn new(input: &str) -> Self {
-        let ariadne = ariadne::Source::from(input);
+        // FIXME This string copy is not ideal, but changing to a reference counted string affects
+        // public API
+        let ariadne = ariadne::Source::from(input.to_string());
 
         let mut map = vec![0; input.len() + 1];
         let mut char_index = 0;

crates/apollo-parser/Cargo.toml

@@ -22,7 +22,7 @@ rowan = "0.15.5"
 thiserror = "1.0.30"
 
 [dev-dependencies]
-ariadne = "0.3.0"
+ariadne = "0.4.0"
 indexmap = "2.0.0"
 anyhow = "1.0.66"
 pretty_assertions = "1.3.0"