Skip to content

Commit a33f8b9

Browse files
committed
update missed std usages and add missed std feature gate
1 parent 66dbf08 commit a33f8b9

File tree

7 files changed

+25
-15
lines changed

7 files changed

+25
-15
lines changed

src/allocator/dedicated_block_allocator/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl SubAllocator for DedicatedBlockAllocator {
140140
.unwrap_or_else(|| "<Unnamed Dedicated allocation>".to_owned()),
141141
offset: 0,
142142
size: self.size,
143-
#[cfg(feature = "visualizer")]
143+
#[cfg(all(feature = "std", feature = "visualizer"))]
144144
backtrace: self.backtrace.clone(),
145145
}]
146146
}

src/allocator/free_list_allocator/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ impl SubAllocator for FreeListAllocator {
426426
.unwrap_or_else(|| "<Unnamed FreeList allocation>".to_owned()),
427427
offset: chunk.offset,
428428
size: chunk.size,
429-
#[cfg(feature = "visualizer")]
429+
#[cfg(all(feature = "std", feature = "visualizer"))]
430430
backtrace: chunk.backtrace.clone(),
431431
})
432432
.collect::<Vec<_>>()

src/d3d12/visualizer.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,11 @@ impl AllocatorVisualizer {
204204
window.block_index,
205205
memblock.size / 1024
206206
));
207-
208-
window
209-
.settings
210-
.ui(ui, allocator.debug_settings.store_stack_traces);
207+
window.settings.ui(
208+
ui,
209+
#[cfg(feature = "std")]
210+
allocator.debug_settings.store_stack_traces,
211+
);
211212

212213
ui.separator();
213214

src/metal/visualizer.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,12 @@ impl AllocatorVisualizer {
148148
memblock.size / 1024
149149
));
150150

151-
window
152-
.settings
153-
.ui(ui, allocator.debug_settings.store_stack_traces);
151+
#[cfg(feature = "std")]
152+
window.settings.ui(
153+
ui,
154+
#[cfg(feature = "std")]
155+
allocator.debug_settings.store_stack_traces,
156+
);
154157

155158
ui.separator();
156159

src/visualizer/allocation_reports.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub(crate) fn render_allocation_reports_ui(
9292
(AllocationReportVisualizeSorting::None, _) => {}
9393
(AllocationReportVisualizeSorting::Idx, true) => allocations.sort_by_key(|(idx, _)| *idx),
9494
(AllocationReportVisualizeSorting::Idx, false) => {
95-
allocations.sort_by_key(|(idx, _)| std::cmp::Reverse(*idx))
95+
allocations.sort_by_key(|(idx, _)| core::cmp::Reverse(*idx))
9696
}
9797
(AllocationReportVisualizeSorting::Name, true) => {
9898
allocations.sort_by(|(_, alloc1), (_, alloc2)| alloc1.name.cmp(&alloc2.name))
@@ -104,7 +104,7 @@ pub(crate) fn render_allocation_reports_ui(
104104
allocations.sort_by_key(|(_, alloc)| alloc.size)
105105
}
106106
(AllocationReportVisualizeSorting::Size, false) => {
107-
allocations.sort_by_key(|(_, alloc)| std::cmp::Reverse(alloc.size))
107+
allocations.sort_by_key(|(_, alloc)| core::cmp::Reverse(alloc.size))
108108
}
109109
}
110110

src/visualizer/memory_chunks.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@ use crate::allocator::free_list_allocator::MemoryChunk;
77

88
pub(crate) struct MemoryChunksVisualizationSettings {
99
pub width_in_bytes: u64,
10+
#[cfg(feature = "std")]
1011
pub show_backtraces: bool,
1112
}
1213

1314
impl Default for MemoryChunksVisualizationSettings {
1415
fn default() -> Self {
1516
Self {
1617
width_in_bytes: 1024,
18+
#[cfg(feature = "std")]
1719
show_backtraces: false,
1820
}
1921
}
2022
}
2123

2224
impl MemoryChunksVisualizationSettings {
23-
pub fn ui(&mut self, ui: &mut Ui, store_stack_traces: bool) {
25+
pub fn ui(&mut self, ui: &mut Ui, #[cfg(feature = "std")] store_stack_traces: bool) {
26+
#[cfg(feature = "std")]
2427
if store_stack_traces {
2528
ui.checkbox(&mut self.show_backtraces, "Show backtraces");
2629
}
@@ -114,6 +117,7 @@ pub(crate) fn render_memory_chunks_ui<'a>(
114117
if let Some(name) = &chunk.name {
115118
ui.label(format!("name: {}", name));
116119
}
120+
#[cfg(feature = "std")]
117121
if settings.show_backtraces
118122
&& chunk.backtrace.status() == BacktraceStatus::Captured
119123
{

src/vulkan/visualizer.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,11 @@ impl AllocatorVisualizer {
182182
memblock.size / 1024
183183
));
184184

185-
window
186-
.settings
187-
.ui(ui, allocator.debug_settings.store_stack_traces);
185+
window.settings.ui(
186+
ui,
187+
#[cfg(feature = "std")]
188+
allocator.debug_settings.store_stack_traces,
189+
);
188190

189191
ui.separator();
190192

0 commit comments

Comments
 (0)