From db05b0902d0c459bc8887e98efe6d8025a17ec74 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Mon, 13 May 2024 23:44:48 +0200
Subject: [PATCH] Remove unneded use of nonsendsync

---
 kubi/src/cursor_lock.rs     | 6 +++---
 kubi/src/events.rs          | 2 +-
 kubi/src/hui_integration.rs | 2 +-
 kubi/src/lib.rs             | 2 +-
 kubi/src/prefabs.rs         | 2 +-
 kubi/src/world/loading.rs   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kubi/src/cursor_lock.rs b/kubi/src/cursor_lock.rs
index 8e195d7..e8a1a43 100644
--- a/kubi/src/cursor_lock.rs
+++ b/kubi/src/cursor_lock.rs
@@ -1,4 +1,4 @@
-use shipyard::{AllStoragesView, IntoIter, NonSendSync, Unique, UniqueView, UniqueViewMut, View};
+use shipyard::{AllStoragesView, IntoIter, Unique, UniqueView, UniqueViewMut, View};
 use crate::{events::InputDeviceEvent, rendering::Renderer};
 use winit::{
   dpi::PhysicalPosition, event::{DeviceEvent, ElementState, RawKeyEvent}, keyboard::{KeyCode, PhysicalKey}, window::CursorGrabMode
@@ -9,7 +9,7 @@ pub struct CursorLock(pub bool);
 
 pub fn update_cursor_lock_state(
   lock: UniqueView<CursorLock>,
-  display: NonSendSync<UniqueView<Renderer>>
+  display: UniqueView<Renderer>
 ) {
   if cfg!(target_os = "android") {
     return
@@ -41,7 +41,7 @@ pub fn lock_cursor_now(
 pub fn debug_toggle_lock(
   mut lock: UniqueViewMut<CursorLock>,
   device_events: View<InputDeviceEvent>,
-  ren: NonSendSync<UniqueView<Renderer>>,
+  ren: UniqueView<Renderer>,
 ) {
   for evt in device_events.iter() {
     if let DeviceEvent::Key(RawKeyEvent {
diff --git a/kubi/src/events.rs b/kubi/src/events.rs
index 4bed070..0e8324f 100644
--- a/kubi/src/events.rs
+++ b/kubi/src/events.rs
@@ -90,7 +90,7 @@ pub fn process_winit_events(world: &mut World, event: &Event<()>) {
 //   mut storages: AllStoragesViewMut,
 // ) {
 //   let (w, h) = {
-//     let renderer = storages.borrow::<NonSendSync<UniqueView<Renderer>>>().unwrap();
+//     let renderer = storages.borrow::<UniqueView<Renderer>>().unwrap();
 //     (renderer.size().width, renderer.size().height)
 //   };
 //   storages.add_entity((
diff --git a/kubi/src/hui_integration.rs b/kubi/src/hui_integration.rs
index 78f0b02..90cdd30 100644
--- a/kubi/src/hui_integration.rs
+++ b/kubi/src/hui_integration.rs
@@ -13,7 +13,7 @@ pub struct UiState {
 pub fn kubi_ui_init(
   storages: AllStoragesView
 ) {
-  let renderer = storages.borrow::<NonSendSync<UniqueView<Renderer>>>().unwrap();
+  let renderer = storages.borrow::<UniqueView<Renderer>>().unwrap();
   storages.add_unique_non_send_sync(UiState {
     hui: UiInstance::new(),
     renderer: WgpuUiRenderer::new(renderer.device(), renderer.surface_config().format),
diff --git a/kubi/src/lib.rs b/kubi/src/lib.rs
index 516c1cf..c5f1c15 100644
--- a/kubi/src/lib.rs
+++ b/kubi/src/lib.rs
@@ -310,7 +310,7 @@ pub fn kubi_main(
 
         //Start rendering (maybe use custom views for this?)
         // let target = {
-        //   let renderer = world.borrow::<NonSendSync<UniqueView<Renderer>>>().unwrap();
+        //   let renderer = world.borrow::<UniqueView<Renderer>>().unwrap();
         //   renderer.display.draw()
         // };
         // world.add_unique_non_send_sync(RenderTarget(target));
diff --git a/kubi/src/prefabs.rs b/kubi/src/prefabs.rs
index 2fb3514..49b0eac 100644
--- a/kubi/src/prefabs.rs
+++ b/kubi/src/prefabs.rs
@@ -76,7 +76,7 @@ pub struct UiFontPrefab(pub FontHandle);
 
 pub fn load_prefabs(
   storages: AllStoragesView,
-  renderer: NonSendSync<UniqueView<Renderer>>,
+  renderer: UniqueView<Renderer>,
   mut ui: NonSendSync<UniqueViewMut<UiState>>,
   assman: UniqueView<AssetManager>
 ) {
diff --git a/kubi/src/world/loading.rs b/kubi/src/world/loading.rs
index 0033ec8..7ee4313 100644
--- a/kubi/src/world/loading.rs
+++ b/kubi/src/world/loading.rs
@@ -266,7 +266,7 @@ fn process_completed_tasks(
   task_manager: UniqueView<ChunkTaskManager>,
   mut world: UniqueViewMut<ChunkStorage>,
   mut meshes: NonSendSync<UniqueViewMut<ChunkMeshStorage>>,
-  renderer: NonSendSync<UniqueView<Renderer>>,
+  renderer: UniqueView<Renderer>,
   state: UniqueView<GameState>,
   mut queue: UniqueViewMut<BlockUpdateQueue>,
 ) {