From 78baa7b12d2ede01ccae4d29660b2d064117c4fe Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Thu, 9 Dec 2021 09:21:37 +0100
Subject: [PATCH] view: removed ::raw for single type views, use
 ::storage().raw() instead

---
 src/entt/entity/view.hpp             |  8 -----
 test/entt/entity/registry_no_eto.cpp |  2 +-
 test/entt/entity/view.cpp            | 45 ++--------------------------
 3 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp
index 53f572999..77fe9de73 100644
--- a/src/entt/entity/view.hpp
+++ b/src/entt/entity/view.hpp
@@ -765,14 +765,6 @@ public:
         return view->empty();
     }
 
-    /**
-     * @brief Direct access to the raw representation offered by the storage.
-     * @return A pointer to the array of components.
-     */
-    [[nodiscard]] auto raw() const ENTT_NOEXCEPT {
-        return view->raw();
-    }
-
     /**
      * @brief Direct access to the list of entities.
      *
diff --git a/test/entt/entity/registry_no_eto.cpp b/test/entt/entity/registry_no_eto.cpp
index a6a917a49..771ceeb45 100644
--- a/test/entt/entity/registry_no_eto.cpp
+++ b/test/entt/entity/registry_no_eto.cpp
@@ -14,7 +14,7 @@ TEST(Registry, NoEto) {
     registry.emplace<empty_type>(entity);
     registry.emplace<int>(entity, 42);
 
-    ASSERT_NE(registry.view<empty_type>().raw(), nullptr);
+    ASSERT_NE(registry.storage<empty_type>().raw(), nullptr);
     ASSERT_NE(registry.try_get<empty_type>(entity), nullptr);
     ASSERT_EQ(registry.view<empty_type>().get(entity), std::as_const(registry).view<const empty_type>().get(entity));
 
diff --git a/test/entt/entity/view.cpp b/test/entt/entity/view.cpp
index 01e5b24cf..11a17287d 100644
--- a/test/entt/entity/view.cpp
+++ b/test/entt/entity/view.cpp
@@ -55,15 +55,11 @@ TEST(SingleComponentView, Functionalities) {
     ASSERT_EQ(view.get<char>(e1), '2');
 
     for(auto entity: view) {
-        ASSERT_TRUE(cview.get<const char>(entity) == '1' || std::get<const char &>(cview.get(entity)) == '2');
+        ASSERT_TRUE(entity == e0 || entity == e1);
+        ASSERT_TRUE(entity != e0 || cview.get<const char>(entity) == '1');
+        ASSERT_TRUE(entity != e1 || std::get<const char &>(cview.get(entity)) == '2');
     }
 
-    ASSERT_EQ(view.data()[0u], e1);
-    ASSERT_EQ(view.data()[1u], e0);
-
-    ASSERT_EQ(view.raw()[0u][0u], '2');
-    ASSERT_EQ(cview.raw()[0u][1u], '1');
-
     registry.erase<char>(e0);
     registry.erase<char>(e1);
 
@@ -96,33 +92,6 @@ TEST(SingleComponentView, Handle) {
     ASSERT_EQ(&handle, &view.handle());
 }
 
-TEST(SingleComponentView, RawData) {
-    entt::registry registry;
-    auto view = registry.view<int>();
-    auto cview = std::as_const(registry).view<const int>();
-
-    const auto entity = registry.create();
-
-    ASSERT_EQ(view.size(), 0u);
-    ASSERT_EQ(cview.size(), 0u);
-    ASSERT_EQ(view.raw(), cview.raw());
-    ASSERT_EQ(view.data(), cview.data());
-
-    registry.emplace<int>(entity, 42);
-
-    ASSERT_NE(view.size(), 0u);
-    ASSERT_NE(cview.size(), 0u);
-    ASSERT_EQ(view.raw()[0u][0u], 42);
-    ASSERT_EQ(cview.raw()[0u][0u], 42);
-    ASSERT_EQ(view.data()[0u], entity);
-    ASSERT_EQ(cview.data()[0u], entity);
-
-    registry.destroy(entity);
-
-    ASSERT_EQ(view.size(), 0u);
-    ASSERT_EQ(cview.size(), 0u);
-}
-
 TEST(SingleComponentView, LazyTypeFromConstRegistry) {
     entt::registry registry{};
     auto eview = std::as_const(registry).view<const empty_type>();
@@ -135,9 +104,6 @@ TEST(SingleComponentView, LazyTypeFromConstRegistry) {
     ASSERT_TRUE(cview);
     ASSERT_TRUE(eview);
 
-    ASSERT_EQ(cview.raw(), nullptr);
-    ASSERT_EQ(eview.data(), nullptr);
-
     ASSERT_TRUE(cview.empty());
     ASSERT_EQ(eview.size(), 0u);
     ASSERT_FALSE(cview.contains(entity));
@@ -262,18 +228,13 @@ TEST(SingleComponentView, ConstNonConstAndAllInBetween) {
     ASSERT_EQ(view.size(), 1u);
     ASSERT_EQ(cview.size(), 1u);
 
-    static_assert(std::is_same_v<decltype(view.raw()), int **>);
-    static_assert(std::is_same_v<decltype(cview.raw()), const int *const *>);
-
     static_assert(std::is_same_v<decltype(view.get<0u>({})), int &>);
     static_assert(std::is_same_v<decltype(view.get<int>({})), int &>);
     static_assert(std::is_same_v<decltype(view.get({})), std::tuple<int &>>);
-    static_assert(std::is_same_v<decltype(view.raw()), int **>);
 
     static_assert(std::is_same_v<decltype(cview.get<0u>({})), const int &>);
     static_assert(std::is_same_v<decltype(cview.get<const int>({})), const int &>);
     static_assert(std::is_same_v<decltype(cview.get({})), std::tuple<const int &>>);
-    static_assert(std::is_same_v<decltype(cview.raw()), const int *const *>);
 
     static_assert(std::is_same_v<decltype(std::as_const(registry).view<int>()), decltype(cview)>);