Skip to content

Commit 97b5be0

Browse files
andyleisersonandyleiserson
committed
Deploying to master from @ gfx-rs/wgpu@24f7796 🚀
1 parent 825883a commit 97b5be0

Some content is hidden

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

42 files changed

+126
-116
lines changed

‎doc/search-index.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎doc/src/wgpu_core/command/bundle.rs.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,15 +3252,15 @@
32523252
}
32533253
}
32543254

3255-
<span class="kw">impl</span>&lt;T, E&gt; MapPassErr&lt;T, RenderBundleError&gt; <span class="kw">for </span><span class="prelude-ty">Result</span>&lt;T, E&gt;
3255+
<span class="kw">impl</span>&lt;E&gt; MapPassErr&lt;RenderBundleError&gt; <span class="kw">for </span>E
32563256
<span class="kw">where
32573257
</span>E: Into&lt;RenderBundleErrorInner&gt;,
32583258
{
3259-
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; <span class="prelude-ty">Result</span>&lt;T, RenderBundleError&gt; {
3260-
<span class="self">self</span>.map_err(|inner| RenderBundleError {
3259+
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; RenderBundleError {
3260+
RenderBundleError {
32613261
scope,
3262-
inner: inner.into(),
3263-
})
3262+
inner: <span class="self">self</span>.into(),
3263+
}
32643264
}
32653265
}
32663266

‎doc/src/wgpu_core/command/compute.rs.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,15 +1517,15 @@
15171517
</span><span class="kw">pub</span>(<span class="kw">super</span>) inner: ComputePassErrorInner,
15181518
}
15191519

1520-
<span class="kw">impl</span>&lt;T, E&gt; MapPassErr&lt;T, ComputePassError&gt; <span class="kw">for </span><span class="prelude-ty">Result</span>&lt;T, E&gt;
1520+
<span class="kw">impl</span>&lt;E&gt; MapPassErr&lt;ComputePassError&gt; <span class="kw">for </span>E
15211521
<span class="kw">where
15221522
</span>E: Into&lt;ComputePassErrorInner&gt;,
15231523
{
1524-
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; <span class="prelude-ty">Result</span>&lt;T, ComputePassError&gt; {
1525-
<span class="self">self</span>.map_err(|inner| ComputePassError {
1524+
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; ComputePassError {
1525+
ComputePassError {
15261526
scope,
1527-
inner: inner.into(),
1528-
})
1527+
inner: <span class="self">self</span>.into(),
1528+
}
15291529
}
15301530
}
15311531

‎doc/src/wgpu_core/command/mod.rs.html‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,16 @@
10921092
<a href="#1091" id="1091">1091</a>
10931093
<a href="#1092" id="1092">1092</a>
10941094
<a href="#1093" id="1093">1093</a>
1095-
<a href="#1094" id="1094">1094</a></pre></div><pre class="rust"><code><span class="kw">mod </span>allocator;
1095+
<a href="#1094" id="1094">1094</a>
1096+
<a href="#1095" id="1095">1095</a>
1097+
<a href="#1096" id="1096">1096</a>
1098+
<a href="#1097" id="1097">1097</a>
1099+
<a href="#1098" id="1098">1098</a>
1100+
<a href="#1099" id="1099">1099</a>
1101+
<a href="#1100" id="1100">1100</a>
1102+
<a href="#1101" id="1101">1101</a>
1103+
<a href="#1102" id="1102">1102</a>
1104+
<a href="#1103" id="1103">1103</a></pre></div><pre class="rust"><code><span class="kw">mod </span>allocator;
10961105
<span class="kw">mod </span>bind;
10971106
<span class="kw">mod </span>bundle;
10981107
<span class="kw">mod </span>clear;
@@ -2123,8 +2132,17 @@
21232132
}
21242133
}
21252134

2126-
<span class="kw">trait </span>MapPassErr&lt;T, O&gt; {
2127-
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; <span class="prelude-ty">Result</span>&lt;T, O&gt;;
2135+
<span class="kw">trait </span>MapPassErr&lt;T&gt; {
2136+
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; T;
2137+
}
2138+
2139+
<span class="kw">impl</span>&lt;T, E, F&gt; MapPassErr&lt;<span class="prelude-ty">Result</span>&lt;T, F&gt;&gt; <span class="kw">for </span><span class="prelude-ty">Result</span>&lt;T, E&gt;
2140+
<span class="kw">where
2141+
</span>E: MapPassErr&lt;F&gt;,
2142+
{
2143+
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; <span class="prelude-ty">Result</span>&lt;T, F&gt; {
2144+
<span class="self">self</span>.map_err(|err| err.map_pass_err(scope))
2145+
}
21282146
}
21292147

21302148
<span class="attr">#[derive(Clone, Copy, Debug)]

‎doc/src/wgpu_core/command/render.rs.html‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3651,10 +3651,7 @@
36513651
<a href="#3650" id="3650">3650</a>
36523652
<a href="#3651" id="3651">3651</a>
36533653
<a href="#3652" id="3652">3652</a>
3654-
<a href="#3653" id="3653">3653</a>
3655-
<a href="#3654" id="3654">3654</a>
3656-
<a href="#3655" id="3655">3655</a>
3657-
<a href="#3656" id="3656">3656</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::Cow, sync::Arc, vec::Vec};
3654+
<a href="#3653" id="3653">3653</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{borrow::Cow, sync::Arc, vec::Vec};
36583655
<span class="kw">use </span>core::{fmt, num::NonZeroU32, ops::Range, str};
36593656

36603657
<span class="kw">use </span>arrayvec::ArrayVec;
@@ -4463,15 +4460,12 @@
44634460
</span><span class="kw">pub</span>(<span class="kw">super</span>) inner: RenderPassErrorInner,
44644461
}
44654462

4466-
<span class="kw">impl</span>&lt;T, E&gt; MapPassErr&lt;T, RenderPassError&gt; <span class="kw">for </span><span class="prelude-ty">Result</span>&lt;T, E&gt;
4467-
<span class="kw">where
4468-
</span>E: Into&lt;RenderPassErrorInner&gt;,
4469-
{
4470-
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; <span class="prelude-ty">Result</span>&lt;T, RenderPassError&gt; {
4471-
<span class="self">self</span>.map_err(|inner| RenderPassError {
4463+
<span class="kw">impl</span>&lt;E: Into&lt;RenderPassErrorInner&gt;&gt; MapPassErr&lt;RenderPassError&gt; <span class="kw">for </span>E {
4464+
<span class="kw">fn </span>map_pass_err(<span class="self">self</span>, scope: PassErrorScope) -&gt; RenderPassError {
4465+
RenderPassError {
44724466
scope,
4473-
inner: inner.into(),
4474-
})
4467+
inner: <span class="self">self</span>.into(),
4468+
}
44754469
}
44764470
}
44774471

‎doc/type.impl/core/result/enum.Result.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎doc/wgpu_core/command/bundle/struct.RenderBundleError.html‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎doc/wgpu_core/command/compute/struct.ComputePassError.html‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎doc/wgpu_core/command/enum.DrawKind.html‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)