Move engine/engine_vfs.{c,h} to user/user_vfs.{c,h}.

PiperOrigin-RevId: 636219666
Change-Id: I820de511948e82256784edb0893f209a73b221e6

src/engine/CMakeLists.txt

@@ -76,8 +76,6 @@ set(MUJOCO_ENGINE_SRCS
     engine_util_sparse_avx.h
     engine_util_spatial.c
     engine_util_spatial.h
-    engine_vfs.c
-    engine_vfs.h
     engine_vis_init.c
     engine_vis_init.h
     engine_vis_interact.c

src/user/CMakeLists.txt

@@ -29,6 +29,8 @@ set(MUJOCO_USER_SRCS
     user_objects.h
     user_util.cc
     user_util.h
+    user_vfs.c
+    user_vfs.h
 )
 
 target_sources(mujoco PRIVATE ${MUJOCO_USER_SRCS})

src/user/user_objects.cc

@@ -45,11 +45,11 @@
 #include "engine/engine_util_misc.h"
 #include "engine/engine_util_solve.h"
 #include "engine/engine_util_spatial.h"
-#include "engine/engine_vfs.h"
 #include "user/user_api.h"
 #include "user/user_cache.h"
 #include "user/user_model.h"
 #include "user/user_util.h"
+#include "user/user_vfs.h"
 
 namespace {
 namespace mju = ::mujoco::util;

src/user/user_vfs.c

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "engine/engine_vfs.h"
+#include "user/user_vfs.h"
 
 #include <stddef.h>
 #include <stdint.h>

src/user/user_vfs.h

@@ -11,9 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+// IWYU pragma: private, include "third_party/mujoco/include/mujoco.h"
+// IWYU pragma: friend "third_party/mujoco/src/.*"
 
-#ifndef MUJOCO_SRC_ENGINE_ENGINE_VFS_H_
-#define MUJOCO_SRC_ENGINE_ENGINE_VFS_H_
+#ifndef MUJOCO_SRC_USER_USER_VFS_H_
+#define MUJOCO_SRC_USER_USER_VFS_H_
 
 #include <stddef.h>
 
@@ -53,4 +55,4 @@ MJAPI mjResource* mju_openVfsResource(const char* name, const mjVFS* vfs);
 }
 #endif
 
-#endif  // MUJOCO_SRC_ENGINE_ENGINE_VFS_H_
+#endif  // MUJOCO_SRC_USER_USER_VFS_H_

src/xml/xml.cc

@@ -35,9 +35,9 @@
 #include "cc/array_safety.h"
 #include "engine/engine_crossplatform.h"
 #include "engine/engine_resource.h"
-#include "engine/engine_vfs.h"
 #include "user/user_api.h"
 #include "user/user_util.h"
+#include "user/user_vfs.h"
 #include "xml/xml_native_reader.h"
 #include "xml/xml_native_writer.h"
 #include "xml/xml_urdf.h"

src/xml/xml_api.cc

@@ -28,8 +28,8 @@
 #include <mujoco/mjmodel.h>
 #include "engine/engine_io.h"
 #include "engine/engine_resource.h"
-#include "engine/engine_vfs.h"
 #include "user/user_api.h"
+#include "user/user_vfs.h"
 #include "xml/xml.h"
 #include "xml/xml_native_reader.h"
 #include "xml/xml_util.h"

test/engine/CMakeLists.txt

@@ -96,9 +96,6 @@ target_link_libraries(engine_util_solve_test fixture gmock)
 mujoco_test(engine_util_spatial_test)
 target_link_libraries(engine_util_spatial_test fixture gmock)
 
-mujoco_test(engine_vfs_test)
-target_link_libraries(engine_vfs_test fixture gmock)
-
 mujoco_test(
   engine_vis_state_test
   PROPERTIES

test/user/CMakeLists.txt

@@ -39,3 +39,6 @@ target_link_libraries(
 
 mujoco_test(user_composite_test)
 target_link_libraries(user_composite_test fixture gmock)
+
+mujoco_test(user_vfs_test)
+target_link_libraries(user_vfs_test fixture gmock)

test/user/user_vfs_test.cc

@@ -21,7 +21,7 @@
 #include <gtest/gtest.h>
 #include <mujoco/mujoco.h>
 #include "src/engine/engine_resource.h"
-#include "src/engine/engine_vfs.h"
+#include "src/user/user_vfs.h"
 #include "test/fixture.h"
 
 namespace mujoco {