diff --git a/lib/tapioca/dsl/compilers/aasm.rb b/lib/tapioca/dsl/compilers/aasm.rb index 87082a4f1..4bd65c3ef 100644 --- a/lib/tapioca/dsl/compilers/aasm.rb +++ b/lib/tapioca/dsl/compilers/aasm.rb @@ -211,7 +211,7 @@ class << self # @override #: -> Enumerable[Module[top]] def gather_constants - T.cast(ObjectSpace.each_object(::AASM::ClassMethods), T::Enumerable[T::Module[T.anything]]) + all_classes.grep(::AASM::ClassMethods) end end end diff --git a/lib/tapioca/dsl/compilers/active_record_relations.rb b/lib/tapioca/dsl/compilers/active_record_relations.rb index 1dea3adb7..da0bb8eaa 100644 --- a/lib/tapioca/dsl/compilers/active_record_relations.rb +++ b/lib/tapioca/dsl/compilers/active_record_relations.rb @@ -183,7 +183,7 @@ class << self # @override #: -> Enumerable[Module[top]] def gather_constants - ActiveRecord::Base.descendants.reject(&:abstract_class?) + descendants_of(::ActiveRecord::Base).reject(&:abstract_class?) end end