Skip to content

Commit 29a6519

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@b626020 🚀
1 parent 74f89fd commit 29a6519

File tree

5 files changed

+138
-16
lines changed

5 files changed

+138
-16
lines changed

doc/naga/enum.AtomicFunction.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<a href="enum.Expression.html#variant.Load" title="variant naga::Expression::Load"><code>Expression::Load</code></a> and <a href="enum.Statement.html#variant.Store" title="variant naga::Statement::Store"><code>Statement::Store</code></a>.</p>
1515
<p>All <code>Handle&lt;Expression&gt;</code> values here refer to an expression in
1616
<a href="struct.Function.html#structfield.expressions" title="field naga::Function::expressions"><code>Function::expressions</code></a>.</p>
17-
</div></details><h2 id="variants" class="variants section-header">Variants<a href="#variants" class="anchor">§</a></h2><div class="variants"><section id="variant.Add" class="variant"><a href="#variant.Add" class="anchor">§</a><h3 class="code-header">Add</h3></section><section id="variant.Subtract" class="variant"><a href="#variant.Subtract" class="anchor">§</a><h3 class="code-header">Subtract</h3></section><section id="variant.And" class="variant"><a href="#variant.And" class="anchor">§</a><h3 class="code-header">And</h3></section><section id="variant.ExclusiveOr" class="variant"><a href="#variant.ExclusiveOr" class="anchor">§</a><h3 class="code-header">ExclusiveOr</h3></section><section id="variant.InclusiveOr" class="variant"><a href="#variant.InclusiveOr" class="anchor">§</a><h3 class="code-header">InclusiveOr</h3></section><section id="variant.Min" class="variant"><a href="#variant.Min" class="anchor">§</a><h3 class="code-header">Min</h3></section><section id="variant.Max" class="variant"><a href="#variant.Max" class="anchor">§</a><h3 class="code-header">Max</h3></section><section id="variant.Exchange" class="variant"><a href="#variant.Exchange" class="anchor">§</a><h3 class="code-header">Exchange</h3></section><div class="sub-variant" id="variant.Exchange.fields"><h4>Fields</h4><div class="sub-variant-field"><span id="variant.Exchange.field.compare" class="section-header"><a href="#variant.Exchange.field.compare" class="anchor field">§</a><code>compare: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.Handle.html" title="struct naga::Handle">Handle</a>&lt;<a class="enum" href="enum.Expression.html" title="enum naga::Expression">Expression</a>&gt;&gt;</code></span></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3333-3347">Source</a><a href="#impl-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><section id="method.map" class="method"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3334-3346">Source</a><h4 class="code-header">pub fn <a href="#method.map" class="fn">map</a>(word: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;Self&gt;</h4></section></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl&lt;'arbitrary&gt; Arbitrary&lt;'arbitrary&gt; for <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.arbitrary" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.arbitrary" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary</a>(u: &amp;mut Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the given unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.arbitrary_take_rest" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.arbitrary_take_rest" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary_take_rest</a>(u: Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the entirety of the given
17+
</div></details><h2 id="variants" class="variants section-header">Variants<a href="#variants" class="anchor">§</a></h2><div class="variants"><section id="variant.Add" class="variant"><a href="#variant.Add" class="anchor">§</a><h3 class="code-header">Add</h3></section><section id="variant.Subtract" class="variant"><a href="#variant.Subtract" class="anchor">§</a><h3 class="code-header">Subtract</h3></section><section id="variant.And" class="variant"><a href="#variant.And" class="anchor">§</a><h3 class="code-header">And</h3></section><section id="variant.ExclusiveOr" class="variant"><a href="#variant.ExclusiveOr" class="anchor">§</a><h3 class="code-header">ExclusiveOr</h3></section><section id="variant.InclusiveOr" class="variant"><a href="#variant.InclusiveOr" class="anchor">§</a><h3 class="code-header">InclusiveOr</h3></section><section id="variant.Min" class="variant"><a href="#variant.Min" class="anchor">§</a><h3 class="code-header">Min</h3></section><section id="variant.Max" class="variant"><a href="#variant.Max" class="anchor">§</a><h3 class="code-header">Max</h3></section><section id="variant.Exchange" class="variant"><a href="#variant.Exchange" class="anchor">§</a><h3 class="code-header">Exchange</h3></section><div class="sub-variant" id="variant.Exchange.fields"><h4>Fields</h4><div class="sub-variant-field"><span id="variant.Exchange.field.compare" class="section-header"><a href="#variant.Exchange.field.compare" class="anchor field">§</a><code>compare: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.Handle.html" title="struct naga::Handle">Handle</a>&lt;<a class="enum" href="enum.Expression.html" title="enum naga::Expression">Expression</a>&gt;&gt;</code></span></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3348-3362">Source</a><a href="#impl-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><section id="method.map" class="method"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3349-3361">Source</a><h4 class="code-header">pub fn <a href="#method.map" class="fn">map</a>(word: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;Self&gt;</h4></section></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl&lt;'arbitrary&gt; Arbitrary&lt;'arbitrary&gt; for <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.arbitrary" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.arbitrary" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary</a>(u: &amp;mut Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the given unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.arbitrary_take_rest" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.arbitrary_take_rest" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary_take_rest</a>(u: Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the entirety of the given
1818
unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.size_hint" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.size_hint" class="anchor">§</a><h4 class="code-header">fn <a class="fn">size_hint</a>(depth: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>) -&gt; (<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>, <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>&gt;)</h4></section></summary><div class='docblock'>Get a size hint for how many bytes out of an <code>Unstructured</code> this type
1919
needs to construct itself. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.try_size_hint" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1108">Source</a><a href="#method.try_size_hint" class="anchor">§</a><h4 class="code-header">fn <a class="fn">try_size_hint</a>(
2020
depth: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>,

doc/src/naga/front/wgsl/error.rs.html

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,30 @@
11501150
<a href="#1149" id="1149">1149</a>
11511151
<a href="#1150" id="1150">1150</a>
11521152
<a href="#1151" id="1151">1151</a>
1153-
<a href="#1152" id="1152">1152</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::diagnostic_filter::ConflictingDiagnosticRuleError;
1153+
<a href="#1152" id="1152">1152</a>
1154+
<a href="#1153" id="1153">1153</a>
1155+
<a href="#1154" id="1154">1154</a>
1156+
<a href="#1155" id="1155">1155</a>
1157+
<a href="#1156" id="1156">1156</a>
1158+
<a href="#1157" id="1157">1157</a>
1159+
<a href="#1158" id="1158">1158</a>
1160+
<a href="#1159" id="1159">1159</a>
1161+
<a href="#1160" id="1160">1160</a>
1162+
<a href="#1161" id="1161">1161</a>
1163+
<a href="#1162" id="1162">1162</a>
1164+
<a href="#1163" id="1163">1163</a>
1165+
<a href="#1164" id="1164">1164</a>
1166+
<a href="#1165" id="1165">1165</a>
1167+
<a href="#1166" id="1166">1166</a>
1168+
<a href="#1167" id="1167">1167</a>
1169+
<a href="#1168" id="1168">1168</a>
1170+
<a href="#1169" id="1169">1169</a>
1171+
<a href="#1170" id="1170">1170</a>
1172+
<a href="#1171" id="1171">1171</a>
1173+
<a href="#1172" id="1172">1172</a>
1174+
<a href="#1173" id="1173">1173</a>
1175+
<a href="#1174" id="1174">1174</a>
1176+
<a href="#1175" id="1175">1175</a></pre></div><pre class="rust"><code><span class="kw">use </span><span class="kw">crate</span>::diagnostic_filter::ConflictingDiagnosticRuleError;
11541177
<span class="kw">use </span><span class="kw">crate</span>::front::wgsl::parse::directive::enable_extension::{
11551178
EnableExtension, UnimplementedEnableExtension,
11561179
};
@@ -1414,6 +1437,8 @@
14141437
found: u32,
14151438
},
14161439
FunctionReturnsVoid(Span),
1440+
FunctionMustUseUnused(Span),
1441+
FunctionMustUseReturnsVoid(Span, Span),
14171442
InvalidWorkGroupUniformLoad(Span),
14181443
Internal(<span class="kw-2">&amp;</span><span class="lifetime">'static </span>str),
14191444
ExpectedConstExprConcreteIntegerScalar(Span),
@@ -1972,6 +1997,27 @@
19721997
<span class="string">"perhaps you meant to call the function in a separate statement?"</span>.into(),
19731998
],
19741999
},
2000+
Error::FunctionMustUseUnused(call) =&gt; ParseError {
2001+
message: <span class="string">"unused return value from function annotated with @must_use"</span>.into(),
2002+
labels: <span class="macro">vec!</span>[(call, <span class="string">""</span>.into())],
2003+
notes: <span class="macro">vec!</span>[
2004+
<span class="macro">format!</span>(
2005+
<span class="string">"function '{}' is declared with `@must_use` attribute"</span>,
2006+
<span class="kw-2">&amp;</span>source[call],
2007+
),
2008+
<span class="string">"use a phony assignment or declare a value using the function call as the initializer"</span>.into(),
2009+
],
2010+
},
2011+
Error::FunctionMustUseReturnsVoid(attr, signature) =&gt; ParseError {
2012+
message: <span class="string">"function annotated with @must_use but does not return any value"</span>.into(),
2013+
labels: <span class="macro">vec!</span>[
2014+
(attr, <span class="string">""</span>.into()),
2015+
(signature, <span class="string">""</span>.into()),
2016+
],
2017+
notes: <span class="macro">vec!</span>[
2018+
<span class="string">"declare a return type or remove the attribute"</span>.into(),
2019+
],
2020+
},
19752021
Error::InvalidWorkGroupUniformLoad(span) =&gt; ParseError {
19762022
message: <span class="string">"incorrect type passed to workgroupUniformLoad"</span>.into(),
19772023
labels: <span class="macro">vec!</span>[(span, <span class="string">""</span>.into())],

0 commit comments

Comments
 (0)