diff --git a/CHANGES.md b/CHANGES.md index aabdf7f69..36e9332cf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ - Add `--force-output` option to force generation of diff file (#118 @clecat) - Support OCaml 4.08.0 (#121 @xclerc) - README and documentation fixes (#122 #118 @andreypopp @clecat @samoht) +- Use latest ocaml-migrate-parsetree interfaces (@avsm) ### 1.3.0 (2019-03-01) - Updated readme file with the new features: dune rules, named environment and diff --git a/lib/migrate_ast.ml b/lib/migrate_ast.ml index dd76e5684..ae52c09f3 100644 --- a/lib/migrate_ast.ml +++ b/lib/migrate_ast.ml @@ -31,20 +31,20 @@ module Asttypes_ = Asttypes module Parsetree_ = Parsetree include ( - Ast_406 : - module type of struct - include Ast_406 + Migrate_parsetree.Ast_406 : + module type of struct + include Migrate_parsetree.Ast_406 end - with module Location := Ast_406.Location - and module Outcometree := Ast_406.Outcometree - and module Asttypes := Ast_406.Asttypes - and module Ast_helper := Ast_406.Ast_helper - and module Parsetree := Ast_406.Parsetree + with module Location := Migrate_parsetree.Ast_406.Location + and module Outcometree := Migrate_parsetree.Ast_406.Outcometree + and module Asttypes := Migrate_parsetree.Ast_406.Asttypes + and module Ast_helper := Migrate_parsetree.Ast_406.Ast_helper + and module Parsetree := Migrate_parsetree.Ast_406.Parsetree ) -module Asttypes = Ast_406.Asttypes -module Ast_helper = Ast_406.Ast_helper -module Parsetree = Ast_406.Parsetree +module Asttypes = Migrate_parsetree.Ast_406.Asttypes +module Ast_helper = Migrate_parsetree.Ast_406.Ast_helper +module Parsetree = Migrate_parsetree.Ast_406.Parsetree module Parse = struct open Migrate_parsetree @@ -166,7 +166,7 @@ module Position = struct end module Location = struct - include Ast_406.Location + include Migrate_parsetree.Ast_406.Location let fmt fs {loc_start; loc_end; loc_ghost} = Format.fprintf fs "(%a..%a)%s" Position.fmt loc_start Position.fmt