remove magicTypes.ml (#11387)

HaxeFoundation · Nov 18, 2023 · 53ad64d · 53ad64d
1 parent 92a40ef
commit 53ad64d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 105 deletions.
diff --git a/extra/haxelib_src b/extra/haxelib_src
diff --git a/src/context/typecore.ml b/src/context/typecore.ml
@@ -103,7 +103,6 @@ type typer_globals = {
 	mutable load_only_cached_modules : bool;
 	functional_interface_lut : (path,tclass_field) lookup;
 	(* api *)
-	do_inherit : typer -> Type.tclass -> pos -> (bool * placed_type_path) -> bool;
 	do_macro : typer -> macro_mode -> path -> string -> expr list -> pos -> expr option;
 	do_load_macro : typer -> bool -> path -> string -> pos -> ((string * bool * t) list * t * tclass * Type.tclass_field);
 	do_load_module : typer -> path -> pos -> module_def;

diff --git a/src/typing/magicTypes.ml b/src/typing/magicTypes.ml
diff --git a/src/typing/typeloadCheck.ml b/src/typing/typeloadCheck.ml
@@ -532,7 +532,6 @@ module Inheritance = struct
 			| HImplements t -> Some(false,t)
 			| t -> None
 		) herits in
-		let herits = List.filter (ctx.g.do_inherit ctx c p) herits in
 		(* Pass 1: Check and set relations *)
 		let check_herit t is_extends p =
 			let rec check_interfaces_or_delay () =

diff --git a/src/typing/typer.ml b/src/typing/typer.ml
@@ -2049,7 +2049,6 @@ let create com macros =
 			type_hints = [];
 			load_only_cached_modules = false;
 			functional_interface_lut = new pmap_lookup;
-			do_inherit = MagicTypes.on_inherit;
 			do_macro = MacroContext.type_macro;
 			do_load_macro = MacroContext.load_macro';
 			do_load_module = TypeloadModule.load_module;
+1 −1		hx4compat
+1 −1		src/legacyhaxelib/Main.hx
+18 −0		src/legacyhaxelib/Remoting_SiteApi.hx