Skip to content

Commit

Permalink
Revert "Add support for upcoming ppx_base. (#541)"
Browse files Browse the repository at this point in the history
This reverts commit 032cb62.
  • Loading branch information
rgrinberg committed Feb 26, 2018
1 parent 31ea399 commit 95c254a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 1 addition & 5 deletions src/gen_rules.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/super_context.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 95c254a

Please sign in to comment.