storage: rework internals (linter)

src/entt/entity/storage.hpp

@@ -317,21 +317,23 @@ protected:
      * @param last An iterator past the last element of the range of entities.
      */
     void pop(underlying_iterator first, underlying_iterator last) override {
-        for([[maybe_unused]] allocator_type allocator{get_allocator()}; first != last; ++first) {
-            // cannot use first.index() because it would break with cross iterators
-            auto &elem = element_at(base_type::index(*first));
-
-            if constexpr(traits_type::in_place_delete) {
+        // cannot use first.index() in any case because it would break with cross iterators
+        if constexpr(traits_type::in_place_delete) {
+            for(allocator_type allocator{get_allocator()}; first != last; ++first) {
+                alloc_traits::destroy(allocator, stl::addressof(element_at(base_type::index(*first))));
                 base_type::in_place_pop(*first);
-                alloc_traits::destroy(allocator, stl::addressof(elem));
-            } else if constexpr(stl::is_trivially_destructible_v<element_type>) {
-                elem = stl::move(element_at(base_type::size() - 1u));
+            }
+        } else if constexpr(stl::is_trivially_destructible_v<element_type>) {
+            for(; first != last; ++first) {
+                element_at(base_type::index(*first)) = stl::move(element_at(base_type::size() - 1u));
                 base_type::swap_and_pop(*first);
-            } else {
-                auto &other = element_at(base_type::size() - 1u);
+            }
+        } else {
+            for(allocator_type allocator{get_allocator()}; first != last; ++first) {
+                auto &elem = element_at(base_type::size() - 1u);
                 // destroying on exit allows reentrant destructors
-                [[maybe_unused]] auto unused = stl::exchange(elem, stl::move(other));
-                alloc_traits::destroy(allocator, stl::addressof(other));
+                [[maybe_unused]] auto unused = stl::exchange(element_at(base_type::index(*first)), stl::move(elem));
+                alloc_traits::destroy(allocator, stl::addressof(elem));
                 base_type::swap_and_pop(*first);
             }
         }