From 8abe644cffd3163c811b843dd09d068ea0472c7d Mon Sep 17 00:00:00 2001
From: YetAnotherClown <yetanotherclown@proton.me>
Date: Tue, 8 Oct 2024 13:54:42 -0400
Subject: [PATCH] Fix merge conflicts with upstream changes

---
 full-moon/src/ast/luau.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/full-moon/src/ast/luau.rs b/full-moon/src/ast/luau.rs
index 109d3d44..4ccf493e 100644
--- a/full-moon/src/ast/luau.rs
+++ b/full-moon/src/ast/luau.rs
@@ -16,11 +16,11 @@ use derive_more::Display;
 pub enum TypeInfo {
     /// A shorthand type annotating the structure of an array: { number }
     #[display(
-        fmt = "{}{}{}{}",
-        "braces.tokens().0",
-        "display_option(access)",
-        "type_info",
-        "braces.tokens().1"
+        "{}{}{}{}",
+        braces.tokens().0,
+        display_option(access),
+        type_info,
+        braces.tokens().1
     )]
     Array {
         /// The braces (`{}`) containing the type info.
@@ -274,7 +274,7 @@ pub enum IndexedTypeInfo {
 /// The `foo: number` in `{ foo: number }`.
 #[derive(Clone, Debug, Display, PartialEq, Node, Visit)]
 #[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
-#[display(fmt = "{}{key}{colon}{value}", "display_option(access)")]
+#[display("{}{key}{colon}{value}", display_option(access))]
 pub struct TypeField {
     pub(crate) access: Option<TokenReference>,
     pub(crate) key: TypeFieldKey,