reduce diff against development

src/context/typecore.ml

@@ -454,8 +454,8 @@ let init_class_done ctx =
 	ctx.pass <- PConnectField
 
 let enter_field_typing_pass ctx info =
-	ctx.pass <- PTypeField;
-	flush_pass ctx PConnectField info
+	flush_pass ctx PConnectField info;
+	ctx.pass <- PTypeField
 
 let make_lazy ?(force=true) ctx t_proc f where =
 	let r = ref (lazy_available t_dynamic) in

src/core/define.ml

@@ -154,9 +154,7 @@ let get_signature def =
 			*)
 			| "display" | "use_rtti_doc" | "macro_times" | "display_details" | "no_copt" | "display_stdin"
 			| "message.reporting" | "message.log_file" | "message.log_format" | "message.no_color"
-			| "dump" | "dump_dependencies" | "dump_ignore_var_ids"
-			| "hxb.roundtrip"
-			-> acc
+			| "dump" | "dump_dependencies" | "dump_ignore_var_ids" -> acc
 			| _ -> (k ^ "=" ^ v) :: acc
 		) def.values [] in
 		let str = String.concat "@" (List.sort compare defines) in

src/core/tType.ml

@@ -387,6 +387,14 @@ and module_type =
 	| TTypeDecl of tdef
 	| TAbstractDecl of tabstract
 
+and module_def = {
+	m_id : int;
+	m_path : path;
+	mutable m_types : module_type list;
+	mutable m_statics : tclass option;
+	m_extra : module_def_extra;
+}
+
 and module_def_display = {
 	mutable m_inline_calls : (pos * pos) list; (* calls whatever is at pos1 from pos2 *)
 	mutable m_type_hints : (pos * pos) list;
@@ -429,14 +437,6 @@ and module_kind =
 	| MExtern
 	| MImport
 
-and module_def = {
-	m_id : int;
-	m_path : path;
-	mutable m_types : module_type list;
-	mutable m_statics : tclass option;
-	mutable m_extra : module_def_extra;
-}
-
 and build_state =
 	| Built
 	| Building of tclass list

src/core/tUnification.ml

@@ -1043,10 +1043,6 @@ and unifies_from_field uctx a b ab tl (t,cf) =
 			let map = apply_params ab.a_params tl in
 			let monos = Monomorph.spawn_constrained_monos map cf.cf_params in
 			let map t = map (apply_params cf.cf_params monos t) in
-			(* trace' (s_type_kind t); *)
-			(* trace' (s_type_kind r); *)
-			(* trace' (s_type_kind (map t)); *)
-			(* trace' (s_type_kind (map r)); *)
 			let uctx = get_abstract_context uctx a b ab in
 			let unify_func = get_abstract_unify_func uctx EqStrict in
 			unify_func a (map t);

tests/display/build.hxml

@@ -5,5 +5,4 @@
 -lib haxeserver
 --interp
 -D use-rtti-doc
-#-D test=11285
--D UTEST-PRINT-TESTS
+#-D test=11285

tests/server/build.hxml

@@ -6,8 +6,8 @@
 -lib utest
 -lib haxeserver
 -D analyzer-optimize
--D UTEST_PRINT_TESTS
-# -D UTEST_PATTERN=10635
+# -D UTEST_PATTERN=9087
+# or set UTEST_PATTERN environment variable
 
 #Temporary. To find out what's wrong with random CI failures
 #--macro addMetadata('@:build(utils.macro.DebugFailures.patchAssert())', 'utest.Assert')

tests/server/run.hxml

@@ -1,3 +1,3 @@
 build.hxml
 --next
--cmd node --trace-uncaught test.js
+-cmd node test.js

tests/unit/.vscode/settings.json

@@ -7,8 +7,8 @@
 		{"label": "Lua", "args": ["compile-lua.hxml", "-cmd", "lua bin/unit.lua"]},
 	],
 	"[haxe]": {
-		"editor.formatOnSave": false,
-		"editor.formatOnPaste": false
+		"editor.formatOnSave": true,
+		"editor.formatOnPaste": true
 	},
 	"editor.codeActionsOnSave": {
 		"source.sortImports": "explicit"