From 95c254a6a06316da0de4404fb71b9e0ad8c853ee Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 26 Feb 2018 21:07:02 +0700 Subject: [PATCH] Revert "Add support for upcoming ppx_base. (#541)" This reverts commit 032cb62af66ee4db09e4c9cb4f84353874a35058. --- src/gen_rules.ml | 6 +----- src/super_context.ml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gen_rules.ml b/src/gen_rules.ml index 7afeb37f..7f235f6b 100644 --- a/src/gen_rules.ml +++ b/src/gen_rules.ml @@ -1021,11 +1021,7 @@ module Gen(P : Params) = struct if List.exists deps ~f:(function | "ppx_driver" | "ppx_type_conv" -> true | _ -> false) then - pps @ [match Scope.name scope with - | Some "ppx_base" -> - Pp.of_string "ppx_base.runner" - | _ -> - Pp.of_string "ppx_driver.runner"] + pps @ [Pp.of_string "ppx_driver.runner"] else pps in diff --git a/src/super_context.ml b/src/super_context.ml index afccfd05..489d3ecf 100644 --- a/src/super_context.ml +++ b/src/super_context.ml @@ -953,7 +953,7 @@ module PP = struct let uses_ppx_driver ~pps = match Option.map ~f:Pp.to_string (List.last pps) with - | Some ("ppx_driver.runner" | "ppx_base.runner") -> true + | Some "ppx_driver.runner" -> true | Some _ | None -> false let promote_correction ~uses_ppx_driver fn build =