Drop dependency of ppx_tools_versioned

aws-gen.opam

@@ -19,9 +19,8 @@ depends: [
   "base-unix"
   "cmdliner" {>= "1.1.0"}
   "fmt"
-  "ppx_tools_versioned"
   "yojson" {>= "1.6.0"}
-  "ocaml-migrate-parsetree"
+  "ocaml-migrate-parsetree" {< "2.0.0"}
   "ocamlgraph"
   "dune" {>= "2.7"}
 ]

src/dune

@@ -2,7 +2,5 @@
  (names aws_gen endpoint_gen)
  (public_names aws-gen endpoint-gen)
  (package aws-gen)
- (preprocess
-  (pps ppx_tools_versioned.metaquot_404))
- (libraries yojson cmdliner fmt unix ppx_tools_versioned
+ (libraries yojson cmdliner fmt unix
    ocaml-migrate-parsetree ocamlgraph atdgen str))

src/generate.ml

@@ -33,8 +33,6 @@
 
 open Structures
 open Util
-open Migrate_parsetree
-open Ast_404
 
 let is_list ~shapes ~shp =
   try
@@ -138,10 +136,10 @@ let types is_ec2 shapes =
                       members)))
           in
           Syntax.let_ "make" (mkfun members body)
-      | Shape.List _ -> [%stri let make elems () = elems]
-      | Shape.Enum _ -> [%stri let make v () = v]
+      | Shape.List _ -> Syntax.(let_ "make" (let elems = "elems" in fun_ elems (fun_ "()" (ident elems))))
+      | Shape.Enum _ -> Syntax.(let_ "make" (let v = "v" in fun_ v (fun_ "()" (ident v))))
       (* TODO: maybe accept a list of tuples and create a Hashtbl *)
-      | Shape.Map _ -> [%stri let make elems () = elems]
+      | Shape.Map _ -> Syntax.(let_ "make" (let elems = "elems" in fun_ elems (fun_ "()" (ident elems))))
     in
     let extra =
       let open Syntax in

src/syntax.ml

@@ -35,9 +35,10 @@ open Migrate_parsetree
 open Ast_404
 open Parsetree
 open Ast_helper
-open Ast_convenience_404
 open Asttypes
 
+let lid s = Location.mkloc (Util.of_option_exn ( Longident.unflatten [ s ] )) !default_loc
+
 let strloc txt = { txt; loc = !default_loc }
 
 (* open Module (in .ml) *)

src/util.ml

@@ -262,3 +262,8 @@ let option_map l ~f =
   match l with
   | None -> None
   | Some x -> Some (f ^ x)
+
+let of_option_exn = function
+  | Some v -> v
+  | None -> failwith "Expected Some v, got None."
+

src/util.mli

@@ -73,3 +73,5 @@ val inline_shapes :
 val filter_map : 'a list -> f:('a -> 'b option) -> 'b list
 
 val option_map : string option -> f:string -> string option
+
+val of_option_exn : 'a option -> 'a