change type signature for impl ariadne::Cache (#960)

* change type signature for impl ariadne::Cache<FileId>

fn fetch() and fn display() changed signatures in the latest patch release of ariadne (0.51.0).

* `fn fetch(&mut self, file_id: &FileId) -> Result<&ariadne::Source, Box<dyn fmt::Debug + '_>>` --> `fn fetch(&mut self, file_id: &FileId) -> Result<&ariadne::Source, impl fmt::Debug>`
* `fn display<'a>(&self, file_id: &'a FileId) -> Option<Box<dyn fmt::Display + 'a>> ` --> `fn display<'a>(&self, file_id: &'a FileId) -> Option<impl fmt::Display + 'a>`

Author: lrlna

crates/apollo-compiler/CHANGELOG.md

@@ -17,6 +17,26 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## Maintenance
 ## Documentation-->
 
+# [1.2x.x] (unreleased) - 2025-mm-dd
+## Fixes
+
+- **Update `ariadne` trait implementations - [lrlna], [pull/960]**
+`[email protected]` release changed their type signature for `ariadne::Cache` trait, which required an update to `apollo-compiler`'s implementation of `ariadne::Cache<FileId>`. 
+
+This release also had a slight change to path formatting, so if you had any snapshots in your tests, you can expect a change from this:
+```
+Error: `typeFragment1` contains too much nesting
+    ╭─[overflow.graphql:11:11]
+```
+
+to this (notice the extra white space around the file path):
+```
+Error: `typeFragment1` contains too much nesting
+    ╭─[ overflow.graphql:11:11 ]
+```
+
+[lrlna]: https://github.com/lrlna
+
 # [1.27.0](https://crates.io/crates/apollo-compiler/1.26.0) - 2025-03-04
 
 ## Features

crates/apollo-compiler/src/diagnostic.rs

@@ -283,7 +283,7 @@ 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 + '_>> {
+    fn fetch(&mut self, file_id: &FileId) -> Result<&ariadne::Source, impl fmt::Debug> {
         struct NotFound(FileId);
         impl fmt::Debug for NotFound {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -296,28 +296,29 @@ impl ariadne::Cache<FileId> for Cache<'_> {
             static EMPTY: OnceLock<ariadne::Source> = OnceLock::new();
             Ok(EMPTY.get_or_init(|| ariadne::Source::from(String::new())))
         } else {
-            Err(Box::new(NotFound(*file_id)))
+            Err(NotFound(*file_id))
         }
     }
 
-    fn display<'a>(&self, file_id: &'a FileId) -> Option<Box<dyn fmt::Display + 'a>> {
-        if *file_id != FileId::NONE {
-            struct Path(Arc<SourceFile>);
-            impl fmt::Display for Path {
-                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                    self.0.path().display().fmt(f)
+    fn display<'a>(&self, file_id: &'a FileId) -> Option<impl fmt::Display + 'a> {
+        enum Path {
+            SourceFile(Arc<SourceFile>),
+            NoSourceFile,
+        }
+        impl fmt::Display for Path {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                match self {
+                    Path::SourceFile(source_file) => source_file.path().display().fmt(f),
+                    Path::NoSourceFile => f.write_str("(no source file)"),
                 }
             }
+        }
+
+        if *file_id != FileId::NONE {
             let source_file = self.0.get(file_id)?;
-            Some(Box::new(Path(source_file.clone())))
+            Some(Path::SourceFile(source_file.clone()))
         } else {
-            struct NoSourceFile;
-            impl fmt::Display for NoSourceFile {
-                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                    f.write_str("(no source file)")
-                }
-            }
-            Some(Box::new(NoSourceFile))
+            Some(Path::NoSourceFile)
         }
     }
 }

crates/apollo-compiler/test_data/diagnostics/0001_duplicate_operatoin_names.txt

@@ -1,5 +1,5 @@
 Error: the operation `getName` is defined multiple times in the document
-   ╭─[0001_duplicate_operatoin_names.graphql:5:7]
+   ╭─[ 0001_duplicate_operatoin_names.graphql:5:7 ]
    │
  1 │ query getName {
    │       ───┬───  

crates/apollo-compiler/test_data/diagnostics/0002_multiple_anonymous_operations.txt

@@ -1,5 +1,5 @@
 Error: anonymous operation cannot be selected when the document contains other operations
-   ╭─[0002_multiple_anonymous_operations.graphql:1:1]
+   ╭─[ 0002_multiple_anonymous_operations.graphql:1:1 ]
    │
  1 │ ╭─▶ query {
    ┆ ┆   
@@ -10,7 +10,7 @@ Error: anonymous operation cannot be selected when the document contains other o
    │     Help: GraphQL requires operations to be named if the document has more than one
 ───╯
 Error: anonymous operation cannot be selected when the document contains other operations
-   ╭─[0002_multiple_anonymous_operations.graphql:5:1]
+   ╭─[ 0002_multiple_anonymous_operations.graphql:5:1 ]
    │
  5 │ ╭─▶ mutation {
    ┆ ┆   

crates/apollo-compiler/test_data/diagnostics/0003_anonymous_and_named_operation.txt

@@ -1,5 +1,5 @@
 Error: anonymous operation cannot be selected when the document contains other operations
-   ╭─[0003_anonymous_and_named_operation.graphql:1:1]
+   ╭─[ 0003_anonymous_and_named_operation.graphql:1:1 ]
    │
  1 │ ╭─▶ query {
    ┆ ┆   
@@ -10,7 +10,7 @@ Error: anonymous operation cannot be selected when the document contains other o
    │     Help: GraphQL requires operations to be named if the document has more than one
 ───╯
 Error: the required argument `Mutation.addPet(name:)` is not provided
-    ╭─[0003_anonymous_and_named_operation.graphql:6:3]
+    ╭─[ 0003_anonymous_and_named_operation.graphql:6:3 ]
     │
   6 │ ╭─▶   addPet {
     ┆ ┆   

crates/apollo-compiler/test_data/diagnostics/0004_subscription_with_multiple_root_fields.txt

@@ -1,5 +1,5 @@
 Error: subscription `sub` can only have one root field
-   ╭─[0004_subscription_with_multiple_root_fields.graphql:1:1]
+   ╭─[ 0004_subscription_with_multiple_root_fields.graphql:1:1 ]
    │
  1 │ ╭─▶ subscription sub {
    ┆ ┆   

crates/apollo-compiler/test_data/diagnostics/0005_subscription_with_multiple_root_fields_in_fragment_spreads.txt

@@ -1,5 +1,5 @@
 Error: subscription `sub` can only have one root field
-   ╭─[0005_subscription_with_multiple_root_fields_in_fragment_spreads.graphql:1:1]
+   ╭─[ 0005_subscription_with_multiple_root_fields_in_fragment_spreads.graphql:1:1 ]
    │
  1 │ ╭─▶ subscription sub {
    ┆ ┆   

crates/apollo-compiler/test_data/diagnostics/0006_subscription_with_multiple_root_fields_in_inline_fragments.txt

@@ -1,5 +1,5 @@
 Error: subscription `sub` can only have one root field
-   ╭─[0006_subscription_with_multiple_root_fields_in_inline_fragments.graphql:1:1]
+   ╭─[ 0006_subscription_with_multiple_root_fields_in_inline_fragments.graphql:1:1 ]
    │
  1 │ ╭─▶ subscription sub {
    ┆ ┆   

crates/apollo-compiler/test_data/diagnostics/0007_operation_with_undefined_variables.txt

@@ -1,19 +1,19 @@
 Error: variable `$undefinedVariable` is not defined
-   ╭─[0007_operation_with_undefined_variables.graphql:3:12]
+   ╭─[ 0007_operation_with_undefined_variables.graphql:3:12 ]
    │
  3 │     first: $undefinedVariable
    │            ─────────┬────────  
    │                     ╰────────── not found in this scope
 ───╯
 Error: variable `$offset` is not defined
-   ╭─[0007_operation_with_undefined_variables.graphql:5:15]
+   ╭─[ 0007_operation_with_undefined_variables.graphql:5:15 ]
    │
  5 │       offset: $offset
    │               ───┬───  
    │                  ╰───── not found in this scope
 ───╯
 Error: variable `$keyword` is not defined
-   ╭─[0007_operation_with_undefined_variables.graphql:6:23]
+   ╭─[ 0007_operation_with_undefined_variables.graphql:6:23 ]
    │
  6 │       keywords: ["a", $keyword]
    │                       ────┬───  

crates/apollo-compiler/test_data/diagnostics/0008_operation_with_undefined_variables_in_inline_fragment.txt

@@ -1,5 +1,5 @@
 Error: variable `$value` is not defined
-   ╭─[0008_operation_with_undefined_variables_in_inline_fragment.graphql:5:25]
+   ╭─[ 0008_operation_with_undefined_variables_in_inline_fragment.graphql:5:25 ]
    │
  5 │         price(setPrice: $value)
    │                         ───┬──