Skip to content

Commit 76867d9

Browse files
Deploying to master from @ gfx-rs/wgpu@c63cfd8 🚀
1 parent a3c0d7b commit 76867d9

File tree

178 files changed

+428
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+428
-454
lines changed

doc/src/wgpu_hal/gles/egl.rs.html

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,29 +1536,9 @@
15361536
<a href="#1535" id="1535">1535</a>
15371537
<a href="#1536" id="1536">1536</a>
15381538
<a href="#1537" id="1537">1537</a>
1539-
<a href="#1538" id="1538">1538</a>
1540-
<a href="#1539" id="1539">1539</a>
1541-
<a href="#1540" id="1540">1540</a>
1542-
<a href="#1541" id="1541">1541</a>
1543-
<a href="#1542" id="1542">1542</a>
1544-
<a href="#1543" id="1543">1543</a>
1545-
<a href="#1544" id="1544">1544</a>
1546-
<a href="#1545" id="1545">1545</a>
1547-
<a href="#1546" id="1546">1546</a>
1548-
<a href="#1547" id="1547">1547</a>
1549-
<a href="#1548" id="1548">1548</a></pre></div><pre class="rust"><code><span class="attr">#![allow(clippy::std_instead_of_alloc, clippy::std_instead_of_core)]
1550-
1551-
</span><span class="kw">use </span>std::{
1552-
ffi,
1553-
mem::ManuallyDrop,
1554-
os::raw,
1555-
ptr,
1556-
rc::Rc,
1557-
string::String,
1558-
sync::{Arc, LazyLock},
1559-
time::Duration,
1560-
vec::Vec,
1561-
};
1539+
<a href="#1538" id="1538">1538</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{rc::Rc, string::String, sync::Arc, vec::Vec};
1540+
<span class="kw">use </span>core::{ffi, mem::ManuallyDrop, ptr, time::Duration};
1541+
<span class="kw">use </span>std::{os::raw, sync::LazyLock};
15621542

15631543
<span class="kw">use </span>glow::HasContext;
15641544
<span class="kw">use </span>hashbrown::HashMap;
@@ -1947,7 +1927,7 @@
19471927
egl: <span class="prelude-ty">Option</span>&lt;EglContextLock&lt;<span class="lifetime">'a</span>&gt;&gt;,
19481928
}
19491929

1950-
<span class="kw">impl</span>&lt;<span class="lifetime">'a</span>&gt; std::ops::Deref <span class="kw">for </span>AdapterContextLock&lt;<span class="lifetime">'a</span>&gt; {
1930+
<span class="kw">impl</span>&lt;<span class="lifetime">'a</span>&gt; core::ops::Deref <span class="kw">for </span>AdapterContextLock&lt;<span class="lifetime">'a</span>&gt; {
19511931
<span class="kw">type </span>Target = glow::Context;
19521932

19531933
<span class="kw">fn </span>deref(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="kw-2">&amp;</span><span class="self">Self</span>::Target {
@@ -2470,7 +2450,7 @@
24702450
<span class="macro">log::debug!</span>(<span class="string">"Enabling EGL debug output"</span>);
24712451
<span class="kw">let </span>function: EglDebugMessageControlFun = {
24722452
<span class="kw">let </span>addr = egl.get_proc_address(<span class="string">"eglDebugMessageControlKHR"</span>).unwrap();
2473-
<span class="kw">unsafe </span>{ std::mem::transmute(addr) }
2453+
<span class="kw">unsafe </span>{ core::mem::transmute(addr) }
24742454
};
24752455
<span class="kw">let </span>attributes = [
24762456
EGL_DEBUG_MSG_CRITICAL_KHR <span class="kw">as </span>khronos_egl::Attrib,
@@ -2566,7 +2546,7 @@
25662546
*/
25672547
</span><span class="macro">log::warn!</span>(<span class="string">"Re-initializing Gles context due to Wayland window"</span>);
25682548

2569-
<span class="kw">use </span>std::ops::DerefMut;
2549+
<span class="kw">use </span>core::ops::DerefMut;
25702550
<span class="kw">let </span>display_attributes = [khronos_egl::ATTRIB_NONE];
25712551

25722552
<span class="kw">let </span>display = <span class="kw">unsafe </span>{
@@ -2590,7 +2570,7 @@
25902570
inner.force_gles_minor_version,
25912571
)<span class="question-mark">?</span>;
25922572

2593-
<span class="kw">let </span>old_inner = std::mem::replace(inner.deref_mut(), new_inner);
2573+
<span class="kw">let </span>old_inner = core::mem::replace(inner.deref_mut(), new_inner);
25942574
inner.wl_display = <span class="prelude-val">Some</span>(display_handle.display.as_ptr());
25952575

25962576
drop(old_inner);

doc/src/wgpu_hal/vulkan/adapter.rs.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2663,7 +2663,9 @@
26632663
<a href="#2662" id="2662">2662</a>
26642664
<a href="#2663" id="2663">2663</a>
26652665
<a href="#2664" id="2664">2664</a>
2666-
<a href="#2665" id="2665">2665</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, ffi::CStr, sync::Arc, vec::Vec};
2666+
<a href="#2665" id="2665">2665</a>
2667+
<a href="#2666" id="2666">2666</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::ToOwned <span class="kw">as _</span>, collections::BTreeMap, sync::Arc, vec::Vec};
2668+
<span class="kw">use </span>core::ffi::CStr;
26672669

26682670
<span class="kw">use </span>ash::{amd, ext, google, khr, vk};
26692671
<span class="kw">use </span>parking_lot::Mutex;

doc/src/wgpu_hal/vulkan/command.rs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@
13001300
<span class="kw">use </span>arrayvec::ArrayVec;
13011301
<span class="kw">use </span>ash::vk;
13021302

1303-
<span class="kw">use </span>std::{mem, ops::Range};
1303+
<span class="kw">use </span>core::{mem, ops::Range};
13041304

13051305
<span class="kw">const </span>ALLOCATION_GRANULARITY: u32 = <span class="number">16</span>;
13061306
<span class="kw">const </span>DST_IMAGE_LAYOUT: vk::ImageLayout = vk::ImageLayout::TRANSFER_DST_OPTIMAL;
@@ -2574,7 +2574,7 @@
25742574
<span class="self">self</span>.active,
25752575
<span class="kw-2">&amp;</span>vk::CopyAccelerationStructureInfoKHR {
25762576
s_type: vk::StructureType::COPY_ACCELERATION_STRUCTURE_INFO_KHR,
2577-
p_next: std::ptr::null(),
2577+
p_next: core::ptr::null(),
25782578
src: src.raw,
25792579
dst: dst.raw,
25802580
mode,

doc/src/wgpu_hal/vulkan/conv.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@
10171017
<a href="#1016" id="1016">1016</a>
10181018
<a href="#1017" id="1017">1017</a>
10191019
<a href="#1018" id="1018">1018</a>
1020-
<a href="#1019" id="1019">1019</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::vec::Vec;
1020+
<a href="#1019" id="1019">1019</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::vec::Vec;
10211021

10221022
<span class="kw">use </span>ash::vk;
10231023

doc/src/wgpu_hal/vulkan/device.rs.html

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3177,15 +3177,21 @@
31773177
<a href="#3176" id="3176">3176</a>
31783178
<a href="#3177" id="3177">3177</a>
31793179
<a href="#3178" id="3178">3178</a>
3180-
<a href="#3179" id="3179">3179</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
3180+
<a href="#3179" id="3179">3179</a>
3181+
<a href="#3180" id="3180">3180</a>
3182+
<a href="#3181" id="3181">3181</a>
3183+
<a href="#3182" id="3182">3182</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
31813184
borrow::{Cow, ToOwned <span class="kw">as _</span>},
31823185
collections::BTreeMap,
3183-
ffi::{CStr, CString},
3186+
ffi::CString,
3187+
sync::Arc,
3188+
vec::Vec,
3189+
};
3190+
<span class="kw">use </span>core::{
3191+
ffi::CStr,
31843192
mem::{<span class="self">self</span>, MaybeUninit},
31853193
num::NonZeroU32,
31863194
ptr,
3187-
sync::Arc,
3188-
vec::Vec,
31893195
};
31903196

31913197
<span class="kw">use </span>arrayvec::ArrayVec;
@@ -3228,7 +3234,7 @@
32283234
.as_bytes()
32293235
.iter()
32303236
.cloned()
3231-
.chain(std::iter::once(<span class="number">0</span>))
3237+
.chain(core::iter::once(<span class="number">0</span>))
32323238
.collect();
32333239
<span class="kw-2">&amp;</span>buffer_vec
32343240
};

doc/src/wgpu_hal/vulkan/drm.rs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
<a href="#150" id="150">150</a>
152152
<a href="#151" id="151">151</a></pre></div><pre class="rust"><code><span class="attr">#![cfg(all(unix, not(target_vendor = <span class="string">"apple"</span>), not(target_family = <span class="string">"wasm"</span>)))]
153153

154-
</span><span class="kw">use </span>core::mem::MaybeUninit;
155-
<span class="kw">use </span>std::{string::ToString, vec::Vec};
154+
</span><span class="kw">use </span>alloc::{string::ToString, vec::Vec};
155+
<span class="kw">use </span>core::mem::MaybeUninit;
156156

157157
<span class="kw">use </span>ash::{ext, khr, vk};
158158

doc/src/wgpu_hal/vulkan/instance.rs.html

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,17 +1142,23 @@
11421142
<a href="#1141" id="1141">1141</a>
11431143
<a href="#1142" id="1142">1142</a>
11441144
<a href="#1143" id="1143">1143</a>
1145-
<a href="#1144" id="1144">1144</a></pre></div><pre class="rust"><code><span class="kw">use </span>std::{
1145+
<a href="#1144" id="1144">1144</a>
1146+
<a href="#1145" id="1145">1145</a>
1147+
<a href="#1146" id="1146">1146</a>
1148+
<a href="#1147" id="1147">1147</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
11461149
borrow::ToOwned <span class="kw">as _</span>,
11471150
boxed::Box,
1148-
ffi::{c_void, CStr, CString},
1149-
slice,
1150-
str::FromStr,
1151+
ffi::CString,
11511152
string::{String, ToString <span class="kw">as _</span>},
11521153
sync::Arc,
1153-
thread,
11541154
vec::Vec,
11551155
};
1156+
<span class="kw">use </span>core::{
1157+
ffi::{c_void, CStr},
1158+
slice,
1159+
str::FromStr,
1160+
};
1161+
<span class="kw">use </span>std::thread;
11561162

11571163
<span class="kw">use </span>arrayvec::ArrayVec;
11581164
<span class="kw">use </span>ash::{ext, khr, vk};
@@ -1164,7 +1170,7 @@
11641170
callback_data_ptr: <span class="kw-2">*const </span>vk::DebugUtilsMessengerCallbackDataEXT,
11651171
user_data: <span class="kw-2">*mut </span>c_void,
11661172
) -&gt; vk::Bool32 {
1167-
<span class="kw">use </span>std::borrow::Cow;
1173+
<span class="kw">use </span>alloc::borrow::Cow;
11681174

11691175
<span class="kw">if </span>thread::panicking() {
11701176
<span class="kw">return </span>vk::FALSE;
@@ -1683,7 +1689,7 @@
16831689
<span class="attr">#[cfg(metal)]
16841690
</span><span class="kw">fn </span>create_surface_from_view(
16851691
<span class="kw-2">&amp;</span><span class="self">self</span>,
1686-
view: std::ptr::NonNull&lt;c_void&gt;,
1692+
view: core::ptr::NonNull&lt;c_void&gt;,
16871693
) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="kw">super</span>::Surface, <span class="kw">crate</span>::InstanceError&gt; {
16881694
<span class="kw">if </span>!<span class="self">self</span>.shared.extensions.contains(<span class="kw-2">&amp;</span>ext::metal_surface::NAME) {
16891695
<span class="kw">return </span><span class="prelude-val">Err</span>(<span class="kw">crate</span>::InstanceError::new(String::from(
@@ -2160,7 +2166,7 @@
21602166

21612167
<span class="kw">unsafe fn </span>acquire_texture(
21622168
<span class="kw-2">&amp;</span><span class="self">self</span>,
2163-
timeout: <span class="prelude-ty">Option</span>&lt;std::time::Duration&gt;,
2169+
timeout: <span class="prelude-ty">Option</span>&lt;core::time::Duration&gt;,
21642170
fence: <span class="kw-2">&amp;</span><span class="kw">super</span>::Fence,
21652171
) -&gt; <span class="prelude-ty">Result</span>&lt;<span class="prelude-ty">Option</span>&lt;<span class="kw">crate</span>::AcquiredSurfaceTexture&lt;<span class="kw">super</span>::Api&gt;&gt;, <span class="kw">crate</span>::SurfaceError&gt; {
21662172
<span class="kw">let </span><span class="kw-2">mut </span>swapchain = <span class="self">self</span>.swapchain.write();

doc/src/wgpu_hal/vulkan/mod.rs.html

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,17 +1484,7 @@
14841484
<a href="#1483" id="1483">1483</a>
14851485
<a href="#1484" id="1484">1484</a>
14861486
<a href="#1485" id="1485">1485</a>
1487-
<a href="#1486" id="1486">1486</a>
1488-
<a href="#1487" id="1487">1487</a>
1489-
<a href="#1488" id="1488">1488</a>
1490-
<a href="#1489" id="1489">1489</a>
1491-
<a href="#1490" id="1490">1490</a>
1492-
<a href="#1491" id="1491">1491</a>
1493-
<a href="#1492" id="1492">1492</a>
1494-
<a href="#1493" id="1493">1493</a>
1495-
<a href="#1494" id="1494">1494</a>
1496-
<a href="#1495" id="1495">1495</a>
1497-
<a href="#1496" id="1496">1496</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
1487+
<a href="#1486" id="1486">1486</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
14981488
# Vulkan API internals.
14991489

15001490
## Stack memory
@@ -1520,8 +1510,6 @@
15201510

15211511
!*/
15221512

1523-
</span><span class="attr">#![allow(clippy::std_instead_of_alloc, clippy::std_instead_of_core)]
1524-
15251513
</span><span class="kw">mod </span>adapter;
15261514
<span class="kw">mod </span>command;
15271515
<span class="kw">mod </span>conv;
@@ -1530,16 +1518,8 @@
15301518
<span class="kw">mod </span>instance;
15311519
<span class="kw">mod </span>sampler;
15321520

1533-
<span class="kw">use </span>std::{
1534-
borrow::Borrow,
1535-
boxed::Box,
1536-
ffi::{CStr, CString},
1537-
fmt, mem,
1538-
num::NonZeroU32,
1539-
ops::DerefMut,
1540-
sync::Arc,
1541-
vec::Vec,
1542-
};
1521+
<span class="kw">use </span>alloc::{boxed::Box, ffi::CString, sync::Arc, vec::Vec};
1522+
<span class="kw">use </span>core::{borrow::Borrow, ffi::CStr, fmt, mem, num::NonZeroU32, ops::DerefMut};
15431523

15441524
<span class="kw">use </span>arrayvec::ArrayVec;
15451525
<span class="kw">use </span>ash::{ext, khr, vk};

doc/src/wgpu_hal/vulkan/sampler.rs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@
216216

217217
<span class="kw">impl </span>Eq <span class="kw">for </span>HashableSamplerCreateInfo {}
218218

219-
<span class="kw">impl </span>std::hash::Hash <span class="kw">for </span>HashableSamplerCreateInfo {
220-
<span class="kw">fn </span>hash&lt;H: std::hash::Hasher&gt;(<span class="kw-2">&amp;</span><span class="self">self</span>, state: <span class="kw-2">&amp;mut </span>H) {
219+
<span class="kw">impl </span>core::hash::Hash <span class="kw">for </span>HashableSamplerCreateInfo {
220+
<span class="kw">fn </span>hash&lt;H: core::hash::Hasher&gt;(<span class="kw-2">&amp;</span><span class="self">self</span>, state: <span class="kw-2">&amp;mut </span>H) {
221221
<span class="self">self</span>.<span class="number">0</span>.flags.hash(state);
222222
<span class="self">self</span>.<span class="number">0</span>.mag_filter.hash(state);
223223
<span class="self">self</span>.<span class="number">0</span>.min_filter.hash(state);

doc/wgpu_core/api/struct.Vulkan.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)