LifeGuard::new takes &str instead of String

Author: scoopr

wgpu-core/src/command/bundle.rs

@@ -1026,7 +1026,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 },
                 used: state.trackers,
                 context: bundle_encoder.context,
-                life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+                life_guard: LifeGuard::new(desc.label.borrow_or_default()),
             }
         };
 

wgpu-core/src/device/mod.rs

@@ -274,9 +274,9 @@ impl<B: GfxBackend> Device<B> {
             desc_allocator: Mutex::new(descriptors),
             queue_group,
             #[cfg(debug_assertions)]
-            life_guard: LifeGuard::new("<device>".to_string()),
+            life_guard: LifeGuard::new("<device>"),
             #[cfg(not(debug_assertions))]
-            life_guard: LifeGuard::new(String::new()),
+            life_guard: LifeGuard::new(""),
             active_submission_index: 0,
             trackers: Mutex::new(TrackerSet::new(B::VARIANT)),
             render_passes: Mutex::new(FastHashMap::default()),
@@ -492,7 +492,7 @@ impl<B: GfxBackend> Device<B> {
             full_range: (),
             sync_mapped_writes: None,
             map_state: resource::BufferMapState::Idle,
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
         })
     }
 
@@ -584,7 +584,7 @@ impl<B: GfxBackend> Device<B> {
                 levels: 0..desc.mip_level_count as hal::image::Level,
                 layers: 0..kind.num_layers(),
             },
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
         })
     }
 
@@ -827,7 +827,7 @@ impl<B: GfxBackend> Device<B> {
                 value: id::Valid(self_id),
                 ref_count: self.life_guard.add_ref(),
             },
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
             bind_group_layout_ids: desc
                 .bind_group_layouts
                 .iter()
@@ -1596,7 +1596,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             extent: texture.kind.extent().at_level(desc.base_mip_level as _),
             samples: texture.kind.num_samples(),
             selector,
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
         };
         let ref_count = view.life_guard.add_ref();
 
@@ -1756,7 +1756,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 value: id::Valid(device_id),
                 ref_count: device.life_guard.add_ref(),
             },
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
             comparison: info.comparison.is_some(),
         };
         let ref_count = sampler.life_guard.add_ref();
@@ -2423,7 +2423,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 ref_count: device.life_guard.add_ref(),
             },
             layout_id: id::Valid(desc.layout),
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
             used,
             dynamic_binding_info,
         };
@@ -3194,7 +3194,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
             flags,
             index_format: desc.vertex_state.index_format,
             vertex_strides,
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
         };
 
         let id = hub
@@ -3418,7 +3418,7 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                 value: id::Valid(device_id),
                 ref_count: device.life_guard.add_ref(),
             },
-            life_guard: LifeGuard::new(desc.label.to_string_or_default()),
+            life_guard: LifeGuard::new(desc.label.borrow_or_default()),
         };
         let id = hub
             .compute_pipelines
@@ -3624,9 +3624,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
 
         let swap_chain = swap_chain::SwapChain {
             #[cfg(debug_assertions)]
-            life_guard: LifeGuard::new("<SwapChain>".to_string()),
+            life_guard: LifeGuard::new("<SwapChain>"),
             #[cfg(not(debug_assertions))]
-            life_guard: LifeGuard::new(String::new()),
+            life_guard: LifeGuard::new(""),
             device_id: Stored {
                 value: id::Valid(device_id),
                 ref_count: device.life_guard.add_ref(),

wgpu-core/src/instance.rs

@@ -225,9 +225,9 @@ impl<B: hal::Backend> Adapter<B> {
             features,
             limits,
             #[cfg(debug_assertions)]
-            life_guard: LifeGuard::new("<Adapter>".to_string()),
+            life_guard: LifeGuard::new("<Adapter>"),
             #[cfg(not(debug_assertions))]
-            life_guard: LifeGuard::new(String::new()),
+            life_guard: LifeGuard::new(""),
         }
     }
 }

wgpu-core/src/lib.rs

@@ -60,8 +60,12 @@ pub type Label<'a> = Option<Cow<'a, str>>;
 
 trait LabelHelpers<'a> {
     fn to_string_or_default(&'a self) -> String;
+    fn borrow_or_default(&'a self) -> &'a str;
 }
 impl<'a> LabelHelpers<'a> for Label<'a> {
+    fn borrow_or_default(&'a self) -> &'a str {
+        self.as_ref().map(|cow| cow.as_ref()).unwrap_or("")
+    }
     fn to_string_or_default(&'a self) -> String {
         self.as_ref()
             .map(|cow| cow.as_ref())
@@ -184,13 +188,13 @@ pub struct LifeGuard {
 
 impl LifeGuard {
     #[allow(unused_variables)]
-    fn new(label: String) -> Self {
+    fn new(label: &str) -> Self {
         let bx = Box::new(AtomicUsize::new(1));
         Self {
             ref_count: ptr::NonNull::new(Box::into_raw(bx)).map(RefCount),
             submission_index: AtomicUsize::new(0),
             #[cfg(debug_assertions)]
-            label,
+            label: label.to_string(),
         }
     }
 

wgpu-core/src/swap_chain.rs

@@ -192,9 +192,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
                         levels: 0..1,
                     },
                     #[cfg(debug_assertions)]
-                    life_guard: LifeGuard::new("<SwapChain View>".to_string()),
+                    life_guard: LifeGuard::new("<SwapChain View>"),
                     #[cfg(not(debug_assertions))]
-                    life_guard: LifeGuard::new(String::new()),
+                    life_guard: LifeGuard::new(""),
                 };
 
                 let ref_count = view.life_guard.add_ref();