camlspotter avatar camlspotter committed 9e237d8

clean-up for release

Comments (0)

Files changed (2)

typing/printtyp.ml

   !Oprint.out_type ppf (tree_of_typexp sch ty)
 
 let typexp sch prio ppf ty =
+  let tree_heuristic = 
+    Opened_path.omit_opened_path := true; Heuristic_expansion.shorten_type_name := true;
+    tree_of_typexp sch ty 
+  in
+  !Oprint.out_type ppf tree_heuristic
+(* debug
   let tree_original = 
     Opened_path.omit_opened_path := false; Heuristic_expansion.shorten_type_name := false;
     tree_of_typexp sch ty 
   in
-  let tree_heuristic = 
-    Opened_path.omit_opened_path := true; Heuristic_expansion.shorten_type_name := true;
-    tree_of_typexp sch ty 
-  in
   if tree_original <> tree_heuristic then
     Format.fprintf ppf "@[%a@ < @[%a@] >@]"
       !Oprint.out_type tree_heuristic
       !Oprint.out_type tree_original
   else
     !Oprint.out_type ppf (tree_of_typexp sch ty)
+*)
 
 let type_expr ppf ty = typexp false 0 ppf ty
 

typing/typemod.ml

         "@[This module is not a functor; it has type@ %a@]" modtype mty
   | Not_included errs ->
       fprintf ppf
-        "@[<v>Signature mismatch:@ %a@]" (Includemod.report_error env)
-	errs
+        "@[<v>Signature mismatch:@ %a@]" (Includemod.report_error env) errs
   | Cannot_eliminate_dependency mty ->
       fprintf ppf
         "@[This functor has type@ %a@ \
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.