diff options
| author |   Mark Wright <gienah@gentoo.org> | 2020-10-13 17:22:12 +1100 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2020-10-13 23:53:34 +1100 |
| commit | 56ae55c8fe67336c2d66bc677fa71ff7315952a4 (patch) | |
| tree | 107bbcb1e0932847a3e5cfeeffd9649d6681f97d /dev-ml/ppx_custom_printf/files | |
| parent | dev-ml/ppx_compare: Bump to 0.14.0 (diff) | |
| download | gentoo-56ae55c8fe67336c2d66bc677fa71ff7315952a4.tar.gz gentoo-56ae55c8fe67336c2d66bc677fa71ff7315952a4.tar.bz2 gentoo-56ae55c8fe67336c2d66bc677fa71ff7315952a4.zip | |
dev-ml/ppx_custom_printf: Bump to 0.14.0
Co-Author: Alexis Ballier <aballier@gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-ml/ppx_custom_printf/files')
| -rw-r--r-- | dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch new file mode 100644 index 000000000000..95cd58aee4cd --- /dev/null +++ b/dev-ml/ppx_custom_printf/files/ppx_custom_printf-0.14.0-ppxlib-0.18.0.patch @@ -0,0 +1,41 @@ +commit 50f8f706e868f8ebac4f2f1392365f994d674463 (HEAD, origin/upgrade-ppxlib-0.18.0) +Author: Nathan Rebours <nathan.p.rebours@gmail.com> +Date: Mon Oct 5 17:56:52 2020 +0200 + + Make ppx_custom_printf compatible with ppxlib.0.18.0 + + ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change + in string constants representation. This PR makes ppx_custom_printf + compatible with the latest ppxlib. + + You might want for the actual release of ppxlib.0.18.0 before merging + this! + + Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com> + +diff --git a/ppx_custom_printf.opam b/ppx_custom_printf.opam +index 80ea710..1cc3d11 100644 +--- a/ppx_custom_printf.opam ++++ b/ppx_custom_printf.opam +@@ -15,7 +15,7 @@ depends: [ + "base" {>= "v0.14" & < "v0.15"} + "ppx_sexp_conv" {>= "v0.14" & < "v0.15"} + "dune" {>= "2.0.0"} +- "ppxlib" {>= "0.11.0"} ++ "ppxlib" {>= "0.18.0"} + ] + synopsis: "Printf-style format-strings for user-defined string conversion" + description: " +diff --git a/src/ppx_custom_printf.ml b/src/ppx_custom_printf.ml +index 18ad7fd..e9ad8b3 100644 +--- a/src/ppx_custom_printf.ml ++++ b/src/ppx_custom_printf.ml +@@ -264,7 +264,7 @@ let expand_format_string ~loc fmt_string = + let expand e = + match e.pexp_desc with + | Pexp_apply ({ pexp_attributes = ident_attrs; _ }, +- [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _)) ++ [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _, _)) + ; pexp_loc = loc; pexp_loc_stack = _ + ; pexp_attributes = str_attrs }) ]) -> + assert_no_attributes ident_attrs; |