Merge branch 'trunk' into refactor_typeclass_ml

.depend

@@ -763,8 +763,8 @@ typing/parmatch.cmo : \
     utils/warnings.cmi \
     typing/untypeast.cmi \
     typing/types.cmi \
-    typing/typedtreeIter.cmi \
     typing/typedtree.cmi \
+    typing/tast_iterator.cmi \
     typing/subst.cmi \
     typing/printpat.cmi \
     typing/predef.cmi \
@@ -785,8 +785,8 @@ typing/parmatch.cmx : \
     utils/warnings.cmx \
     typing/untypeast.cmx \
     typing/types.cmx \
-    typing/typedtreeIter.cmx \
     typing/typedtree.cmx \
+    typing/tast_iterator.cmx \
     typing/subst.cmx \
     typing/printpat.cmx \
     typing/predef.cmx \
@@ -1046,6 +1046,20 @@ typing/subst.cmi : \
     typing/types.cmi \
     typing/path.cmi \
     typing/ident.cmi
+typing/tast_iterator.cmo : \
+    typing/typedtree.cmi \
+    typing/env.cmi \
+    parsing/asttypes.cmi \
+    typing/tast_iterator.cmi
+typing/tast_iterator.cmx : \
+    typing/typedtree.cmx \
+    typing/env.cmx \
+    parsing/asttypes.cmi \
+    typing/tast_iterator.cmi
+typing/tast_iterator.cmi : \
+    typing/typedtree.cmi \
+    typing/env.cmi \
+    parsing/asttypes.cmi
 typing/tast_mapper.cmo : \
     typing/typedtree.cmi \
     typing/env.cmi \
@@ -1404,19 +1418,6 @@ typing/typedtree.cmi : \
     typing/ident.cmi \
     typing/env.cmi \
     parsing/asttypes.cmi
-typing/typedtreeIter.cmo : \
-    typing/typedtree.cmi \
-    utils/misc.cmi \
-    parsing/asttypes.cmi \
-    typing/typedtreeIter.cmi
-typing/typedtreeIter.cmx : \
-    typing/typedtree.cmx \
-    utils/misc.cmx \
-    parsing/asttypes.cmi \
-    typing/typedtreeIter.cmi
-typing/typedtreeIter.cmi : \
-    typing/typedtree.cmi \
-    parsing/asttypes.cmi
 typing/typemod.cmo : \
     utils/warnings.cmi \
     typing/typetexp.cmi \

.gitattributes

@@ -56,7 +56,7 @@ tools/mantis2gh_stripped.csv typo.missing-header
 /tools/ci/appveyor/appveyor_build.cmd       typo.very-long-line typo.missing-header typo.non-ascii
 /tools/ci/appveyor/appveyor_build.sh        typo.non-ascii
 /tools/ci/inria/remove-sinh-primitive.patch typo.white-at-eol typo.missing-header typo.long-line
-/tools/release-checklist                    typo.missing-header
+/tools/release-checklist                    typo.missing-header typo.very-long-line
 
 # ignore auto-generated .depend files
 .depend                  typo.prune

.gitignore

@@ -67,6 +67,7 @@ _build
 
 /boot/ocamlrun
 /boot/camlheader
+/boot/ocamlc.opt
 
 /bytecomp/runtimedef.ml
 /bytecomp/opcodes.ml

.mailmap

@@ -48,6 +48,7 @@ Nicolás Ojeda Bär <n.oje.bar@gmail.com>
 
 Gabriel Radanne <Drup>
 Vincent Laviron <lthls@github>
+Jeremy Yallop <yallop>
 
 
 ### Remembering naming preferences for contributors

.travis.yml

@@ -35,9 +35,9 @@ matrix:
   - env: CI_KIND=changes
   - env: CI_KIND=manual
   - env: CI_KIND=check-typo
-  - env: CI_KIND=tests
-  allow_failures:
-  - env: CI_KIND=tests
+#  - env: CI_KIND=tests
+#  allow_failures:
+#  - env: CI_KIND=tests
 addons:
   apt:
     packages:

CONTRIBUTING.md

@@ -243,12 +243,11 @@ Any user-visible change should have a `Changes` entry:
 
 - using the label "`*`" if it breaks existing programs, "`-`" otherwise
 
-- with the issue number `PR#{N}` if from mantis, `GPR#{N}` if from github
-  (several numbers separated by commas can be used)
+- with all relevant issue and PR numbers `#{N}`, in ascending numerical order
+  (separated by commas if necessary)
 
-- maintaining the order: each section lists Mantis PRs first in ascending
-  numerical order, followed by Github PRs in ascending numerical order,
-  followed by changes that are not related to a PR.
+- maintaining the order: the entries in each section should be sorted by
+  issue/PR number (the first of each entry, if more than one is available)
 
 - with a concise readable description of the change (possibly taken
   from a commit message, but it should make sense to end-users