From: Joshua Simmons <josh@nega.tv>
Date: Sun, 20 Aug 2023 16:00:27 +0000 (+0200)
Subject: narcissus-gpu: Use std from_bytes_until_nul
X-Git-Url: https://git.nega.tv//gitweb.cgi?a=commitdiff_plain;h=2f0d4e90949a480210c4972fe09fb456bf4d381e;p=josh%2Fnarcissus

narcissus-gpu: Use std from_bytes_until_nul
---

diff --git a/libs/narcissus-gpu/src/backend/vulkan/wsi.rs b/libs/narcissus-gpu/src/backend/vulkan/wsi.rs
index 08b8731..c8c7585 100644
--- a/libs/narcissus-gpu/src/backend/vulkan/wsi.rs
+++ b/libs/narcissus-gpu/src/backend/vulkan/wsi.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use narcissus_core::{
-    cstr, cstr_from_bytes_until_nul, default,
+    cstr, default,
     raw_window::{AsRawWindow, RawWindow},
     HybridArena, Mutex, Pool, Widen,
 };
@@ -77,7 +77,7 @@ impl VulkanWsi {
         let mut wsi_support: VulkanWsiSupport = default();
 
         for extension in extension_properties {
-            let extension_name = cstr_from_bytes_until_nul(&extension.extension_name).unwrap();
+            let extension_name = CStr::from_bytes_until_nul(&extension.extension_name).unwrap();
 
             match extension_name.to_str().unwrap() {
                 "VK_KHR_wayland_surface" => {
@@ -114,7 +114,7 @@ impl VulkanWsi {
         enabled_extensions: &mut Vec<&'a CStr>,
     ) {
         for extension in extension_properties {
-            let extension_name = cstr_from_bytes_until_nul(&extension.extension_name).unwrap();
+            let extension_name = CStr::from_bytes_until_nul(&extension.extension_name).unwrap();
             if extension_name.to_str().unwrap() == "VK_KHR_swapchain" {
                 enabled_extensions.push(extension_name);
                 return;