From 1e353005d25390943d69620cadf768c76fe2e882 Mon Sep 17 00:00:00 2001
From: Patrick Ferris <patrick@sirref.org>
Date: Fri, 27 Sep 2024 16:03:35 +0100
Subject: [PATCH] Prepare for 5.2 AST bump

---
 ppx_deriving_yojson.opam   | 2 +-
 src/ppx_deriving_yojson.ml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppx_deriving_yojson.opam b/ppx_deriving_yojson.opam
index e7ef03b..b00c197 100644
--- a/ppx_deriving_yojson.opam
+++ b/ppx_deriving_yojson.opam
@@ -17,7 +17,7 @@ depends: [
   "dune" {>= "1.0"}
   "yojson" {>= "1.6.0"}
   "ppx_deriving" {>= "5.1"}
-  "ppxlib" {>= "0.30.0"}
+  "ppxlib" {>= "0.35.0"}
   "ounit2" {with-test}
 ]
 synopsis:
diff --git a/src/ppx_deriving_yojson.ml b/src/ppx_deriving_yojson.ml
index 981ff2b..f89869b 100644
--- a/src/ppx_deriving_yojson.ml
+++ b/src/ppx_deriving_yojson.ml
@@ -148,7 +148,7 @@ and ser_expr_of_only_typ ~quoter typ =
     Exp.function_ cases
   | { ptyp_desc = Ptyp_var name } -> [%expr ([%e evar ("poly_"^name)] : _ -> Yojson.Safe.t)]
   | { ptyp_desc = Ptyp_alias (typ, name) } ->
-    [%expr fun x -> [%e evar ("poly_"^name)] x; [%e ser_expr_of_typ typ] x]
+    [%expr fun x -> [%e evar ("poly_"^name.txt)] x; [%e ser_expr_of_typ typ] x]
   | { ptyp_desc = Ptyp_poly (names, typ) } ->
      poly_fun names (ser_expr_of_typ typ)
   | { ptyp_loc } ->
@@ -279,7 +279,7 @@ and desu_expr_of_only_typ ~quoter ~path typ =
   | { ptyp_desc = Ptyp_var name } ->
     [%expr ([%e evar ("poly_"^name)] : Yojson.Safe.t -> _ error_or)]
   | { ptyp_desc = Ptyp_alias (typ, name) } ->
-    [%expr fun x -> [%e evar ("poly_"^name)] x; [%e desu_expr_of_typ ~path typ] x]
+    [%expr fun x -> [%e evar ("poly_"^name.txt)] x; [%e desu_expr_of_typ ~path typ] x]
   | { ptyp_desc = Ptyp_poly (names, typ) } ->
      poly_fun names (desu_expr_of_typ ~path typ)
   | { ptyp_loc } ->