Deploying to master from @ gfx-rs/wgpu@964a8d9 🚀

Author: cwfitzgerald

doc/src/naga/back/msl/writer.rs.html

@@ -11560,7 +11560,7 @@
                             AttributeMappingResolved {
                                 ty_name: ty_name.to_string(),
                                 dimension: ty_name.vertex_input_dimension(),
-                                ty_is_int: ty_name.scalar().map_or(<span class="bool-val">false</span>, scalar_is_int),
+                                ty_is_int: ty_name.scalar().is_some_and(scalar_is_int),
                                 name: name.to_string(),
                             },
                         );

doc/src/naga/front/glsl/functions.rs.html

@@ -1758,7 +1758,7 @@
                 )<span class="question-mark">?
             </span>}
             TypeInner::Vector { size, scalar } =&gt; {
-                <span class="kw">if </span>vector_size.map_or(<span class="bool-val">true</span>, |s| s != size) {
+                <span class="kw">if </span>vector_size != <span class="prelude-val">Some</span>(size) {
                     value = ctx.vector_resize(size, value, expr_meta)<span class="question-mark">?</span>;
                 }
 

doc/src/naga/front/glsl/parser/declarations.rs.html

@@ -869,7 +869,7 @@
         // Consume any leading comma, e.g. this is valid: `float, a=1;`
         </span><span class="kw">if </span><span class="self">self
             </span>.peek(frontend)
-            .map_or(<span class="bool-val">false</span>, |t| t.value == TokenValue::Comma)
+            .is_some_and(|t| t.value == TokenValue::Comma)
         {
             <span class="self">self</span>.next(frontend);
         }

doc/src/naga/front/glsl/parser/functions.rs.html

@@ -675,7 +675,7 @@
 
 <span class="kw">impl </span>ParsingContext&lt;<span class="lifetime">'_</span>&gt; {
     <span class="kw">pub fn </span>peek_parameter_qualifier(<span class="kw-2">&amp;mut </span><span class="self">self</span>, frontend: <span class="kw-2">&amp;mut </span>Frontend) -&gt; bool {
-        <span class="self">self</span>.peek(frontend).map_or(<span class="bool-val">false</span>, |t| <span class="kw">match </span>t.value {
+        <span class="self">self</span>.peek(frontend).is_some_and(|t| <span class="kw">match </span>t.value {
             TokenValue::In | TokenValue::Out | TokenValue::InOut | TokenValue::Const =&gt; <span class="bool-val">true</span>,
             <span class="kw">_ </span>=&gt; <span class="bool-val">false</span>,
         })

doc/src/naga/front/glsl/parser/types.rs.html

@@ -591,7 +591,7 @@
     }
 
     <span class="kw">pub fn </span>peek_type_qualifier(<span class="kw-2">&amp;mut </span><span class="self">self</span>, frontend: <span class="kw-2">&amp;mut </span>Frontend) -&gt; bool {
-        <span class="self">self</span>.peek(frontend).map_or(<span class="bool-val">false</span>, |t| <span class="kw">match </span>t.value {
+        <span class="self">self</span>.peek(frontend).is_some_and(|t| <span class="kw">match </span>t.value {
             TokenValue::Invariant
             | TokenValue::Interpolation(<span class="kw">_</span>)
             | TokenValue::Sampling(<span class="kw">_</span>)
@@ -823,7 +823,7 @@
     }
 
     <span class="kw">pub fn </span>peek_type_name(<span class="kw-2">&amp;mut </span><span class="self">self</span>, frontend: <span class="kw-2">&amp;mut </span>Frontend) -&gt; bool {
-        <span class="self">self</span>.peek(frontend).map_or(<span class="bool-val">false</span>, |t| <span class="kw">match </span>t.value {
+        <span class="self">self</span>.peek(frontend).is_some_and(|t| <span class="kw">match </span>t.value {
             TokenValue::TypeName(<span class="kw">_</span>) | TokenValue::Void =&gt; <span class="bool-val">true</span>,
             TokenValue::Struct =&gt; <span class="bool-val">true</span>,
             TokenValue::Identifier(<span class="kw-2">ref </span>ident) =&gt; frontend.lookup_type.contains_key(ident),

doc/src/naga/front/spv/mod.rs.html

@@ -11434,7 +11434,7 @@
         <span class="kw">let </span>parent_decor = <span class="self">self</span>.future_decor.remove(<span class="kw-2">&amp;</span>id);
         <span class="kw">let </span>is_storage_buffer = parent_decor
             .as_ref()
-            .map_or(<span class="bool-val">false</span>, |decor| decor.storage_buffer);
+            .is_some_and(|decor| decor.storage_buffer);
 
         <span class="self">self</span>.layouter.update(module.to_ctx()).unwrap();
 

doc/src/wgpu/util/init.rs.html

@@ -210,8 +210,6 @@
 <a href="#209" id="209">209</a>
 <a href="#210" id="210">210</a>
 <a href="#211" id="211">211</a>
-<a href="#212" id="212">212</a>
-<a href="#213" id="213">213</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>wgt::{Backends, PowerPreference, RequestAdapterOptions};
 
 <span class="kw">use crate</span>::{Adapter, Instance, Surface};
@@ -386,9 +384,7 @@
         </span><span class="kw">let </span>adapter_promise = gpu.request_adapter();
         wasm_bindgen_futures::JsFuture::from(adapter_promise)
             .<span class="kw">await
-            </span>.map_or(<span class="bool-val">false</span>, |adapter| {
-                !adapter.is_undefined() &amp;&amp; !adapter.is_null()
-            })
+            </span>.is_ok_and(|adapter| !adapter.is_undefined() &amp;&amp; !adapter.is_null())
     }
     <span class="attr">#[cfg(not(webgpu))]
     </span>{

doc/src/wgpu_core/device/resource.rs.html

@@ -6311,7 +6311,7 @@
     ) -&gt; <span class="prelude-ty">Result</span>&lt;Arc&lt;binding_model::PipelineLayout&gt;, pipeline::ImplicitLayoutError&gt; {
         <span class="kw">while </span>derived_group_layouts
             .last()
-            .map_or(<span class="bool-val">false</span>, |map| map.is_empty())
+            .is_some_and(|map| map.is_empty())
         {
             derived_group_layouts.pop();
         }

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

@@ -1409,7 +1409,7 @@
             <span class="kw">if </span>dirty_textures &amp; (<span class="number">1 </span>&lt;&lt; texture_index) != <span class="number">0
                 </span>|| slot
                     .sampler_index
-                    .map_or(<span class="bool-val">false</span>, |si| dirty_samplers &amp; (<span class="number">1 </span>&lt;&lt; si) != <span class="number">0</span>)
+                    .is_some_and(|si| dirty_samplers &amp; (<span class="number">1 </span>&lt;&lt; si) != <span class="number">0</span>)
             {
                 <span class="kw">let </span>sampler = slot
                     .sampler_index

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

@@ -2452,8 +2452,6 @@
 <a href="#2451" id="2451">2451</a>
 <a href="#2452" id="2452">2452</a>
 <a href="#2453" id="2453">2453</a>
-<a href="#2454" id="2454">2454</a>
-<a href="#2455" id="2455">2455</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">super</span>::conv;
 
 <span class="kw">use </span>ash::{amd, ext, google, khr, vk};
@@ -3954,15 +3952,15 @@
                 <span class="prelude-val">Some</span>(features) =&gt; features.imageless_framebuffer == vk::TRUE,
                 <span class="prelude-val">None </span>=&gt; phd_features
                     .imageless_framebuffer
-                    .map_or(<span class="bool-val">false</span>, |ext| ext.imageless_framebuffer != <span class="number">0</span>),
+                    .is_some_and(|ext| ext.imageless_framebuffer != <span class="number">0</span>),
             },
             image_view_usage: phd_capabilities.device_api_version &gt;= vk::API_VERSION_1_1
                 || phd_capabilities.supports_extension(khr::maintenance2::NAME),
             timeline_semaphores: <span class="kw">match </span>phd_features.timeline_semaphore {
                 <span class="prelude-val">Some</span>(features) =&gt; features.timeline_semaphore == vk::TRUE,
                 <span class="prelude-val">None </span>=&gt; phd_features
                     .timeline_semaphore
-                    .map_or(<span class="bool-val">false</span>, |ext| ext.timeline_semaphore != <span class="number">0</span>),
+                    .is_some_and(|ext| ext.timeline_semaphore != <span class="number">0</span>),
             },
             texture_d24: supports_format(
                 <span class="kw-2">&amp;</span><span class="self">self</span>.shared.raw,
@@ -3993,7 +3991,7 @@
                 <span class="prelude-val">Some</span>(<span class="kw-2">ref </span>f) =&gt; f.robust_image_access2 != <span class="number">0</span>,
                 <span class="prelude-val">None </span>=&gt; phd_features
                     .image_robustness
-                    .map_or(<span class="bool-val">false</span>, |ext| ext.robust_image_access != <span class="number">0</span>),
+                    .is_some_and(|ext| ext.robust_image_access != <span class="number">0</span>),
             },
             robust_buffer_access2: phd_features
                 .robustness2
@@ -4007,9 +4005,7 @@
                 .unwrap_or_default(),
             zero_initialize_workgroup_memory: phd_features
                 .zero_initialize_workgroup_memory
-                .map_or(<span class="bool-val">false</span>, |ext| {
-                    ext.shader_zero_initialize_workgroup_memory == vk::TRUE
-                }),
+                .is_some_and(|ext| ext.shader_zero_initialize_workgroup_memory == vk::TRUE),
             image_format_list: phd_capabilities.device_api_version &gt;= vk::API_VERSION_1_2
                 || phd_capabilities.supports_extension(khr::image_format_list::NAME),
             <span class="attr">#[cfg(windows)]