Skip to content

Commit 6e574e1

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update rustdoc tests
1 parent 33df8a9 commit 6e574e1

File tree

8 files changed

+41
-40
lines changed

8 files changed

+41
-40
lines changed

Diff for: ‎src/librustdoc/html/highlight/fixtures/decorations.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<span class="example"><span class="kw">let</span> <span class="ident">x</span> = <span class="number">1</span>;</span>
2-
<span class="kw">let</span> <span class="ident">y</span> = <span class="number">2</span>;
1+
<span class="example"><span class="kw">let </span>x = <span class="number">1</span>;</span>
2+
<span class="kw">let </span>y = <span class="number">2</span>;

Diff for: ‎src/librustdoc/html/highlight/fixtures/dos_line.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">foo</span>() {
1+
<span class="kw">pub fn </span>foo() {
22
<span class="macro">println!</span>(<span class="string">&quot;foo&quot;</span>);
33
}

Diff for: ‎src/librustdoc/html/highlight/fixtures/highlight.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::a::foo</span>;
2-
<span class="kw">use</span> <span class="ident"><span class="self">self</span>::whatever</span>;
3-
<span class="kw">let</span> <span class="ident">x</span> = <span class="ident"><span class="kw">super</span>::b::foo</span>;
4-
<span class="kw">let</span> <span class="ident">y</span> = <span class="ident"><span class="self">Self</span>::whatever</span>;
1+
<span class="kw">use </span><span class="kw">crate</span>::a::foo;
2+
<span class="kw">use </span><span class="self">self</span>::whatever;
3+
<span class="kw">let </span>x = <span class="kw">super</span>::b::foo;
4+
<span class="kw">let </span>y = <span class="self">Self</span>::whatever;

Diff for: ‎src/librustdoc/html/highlight/fixtures/sample.html

+19-19
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@
88
.lifetime { color: #B76514; }
99
.question-mark { color: #ff9011; }
1010
</style>
11-
<pre><code><span class="attribute">#![<span class="ident">crate_type</span> = <span class="string">&quot;lib&quot;</span>]</span>
11+
<pre><code><span class="attribute">#![crate_type = <span class="string">&quot;lib&quot;</span>]</span>
1212

13-
<span class="kw">use</span> <span class="ident">std::path</span>::{<span class="ident">Path</span>, <span class="ident">PathBuf</span>};
13+
<span class="kw">use </span>std::path::{Path, PathBuf};
1414

15-
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">target_os</span> = <span class="string">&quot;linux&quot;</span>)]</span>
16-
<span class="kw">fn</span> <span class="ident">main</span>() -&gt; () {
17-
<span class="kw">let</span> <span class="ident">foo</span> = <span class="bool-val">true</span> &amp;&amp; <span class="bool-val">false</span> || <span class="bool-val">true</span>;
18-
<span class="kw">let</span> <span class="kw">_</span>: <span class="kw-2">*const</span> () = <span class="number">0</span>;
19-
<span class="kw">let</span> <span class="kw">_</span> = <span class="kw-2">&amp;</span><span class="ident">foo</span>;
20-
<span class="kw">let</span> <span class="kw">_</span> = &amp;&amp;<span class="ident">foo</span>;
21-
<span class="kw">let</span> <span class="kw">_</span> = <span class="kw-2">*</span><span class="ident">foo</span>;
22-
<span class="macro">mac!</span>(<span class="ident">foo</span>, <span class="kw-2">&amp;mut</span> <span class="ident">bar</span>);
23-
<span class="macro">assert!</span>(<span class="self">self</span>.<span class="ident">length</span> &lt; <span class="ident">N</span> &amp;&amp; <span class="ident">index</span> &lt;= <span class="self">self</span>.<span class="ident">length</span>);
24-
<span class="ident">::std::env::var</span>(<span class="string">&quot;gateau&quot;</span>).<span class="ident">is_ok</span>();
25-
<span class="attribute">#[<span class="ident">rustfmt::skip</span>]</span>
26-
<span class="kw">let</span> <span class="ident">s</span>:<span class="ident">std::path::PathBuf</span> = <span class="ident">std::path::PathBuf::new</span>();
27-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">s</span> = <span class="ident">String::new</span>();
15+
<span class="attribute">#[cfg(target_os = <span class="string">&quot;linux&quot;</span>)]</span>
16+
<span class="kw">fn </span>main() -&gt; () {
17+
<span class="kw">let </span>foo = <span class="bool-val">true </span>&amp;&amp; <span class="bool-val">false </span>|| <span class="bool-val">true</span>;
18+
<span class="kw">let _</span>: <span class="kw-2">*const </span>() = <span class="number">0</span>;
19+
<span class="kw">let _ </span>= <span class="kw-2">&amp;</span>foo;
20+
<span class="kw">let _ </span>= &amp;&amp;foo;
21+
<span class="kw">let _ </span>= <span class="kw-2">*</span>foo;
22+
<span class="macro">mac!</span>(foo, <span class="kw-2">&amp;mut </span>bar);
23+
<span class="macro">assert!</span>(<span class="self">self</span>.length &lt; N &amp;&amp; index &lt;= <span class="self">self</span>.length);
24+
::std::env::var(<span class="string">&quot;gateau&quot;</span>).is_ok();
25+
<span class="attribute">#[rustfmt::skip]</span>
26+
<span class="kw">let </span>s:std::path::PathBuf = std::path::PathBuf::new();
27+
<span class="kw">let </span><span class="kw-2">mut </span>s = String::new();
2828

29-
<span class="kw">match</span> <span class="kw-2">&amp;</span><span class="ident">s</span> {
30-
<span class="kw-2">ref</span> <span class="kw-2">mut</span> <span class="ident">x</span> =&gt; {}
29+
<span class="kw">match </span><span class="kw-2">&amp;</span>s {
30+
<span class="kw-2">ref mut </span>x =&gt; {}
3131
}
3232
}
3333

34-
<span class="macro">macro_rules!</span> <span class="ident">bar</span> {
35-
(<span class="macro-nonterminal">$</span><span class="macro-nonterminal">foo</span>:<span class="ident">tt</span>) =&gt; {};
34+
<span class="macro">macro_rules!</span> bar {
35+
(<span class="macro-nonterminal">$foo</span>:tt) =&gt; {};
3636
}
3737
</code></pre>

Diff for: ‎src/librustdoc/html/highlight/fixtures/union.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<span class="kw">union</span> <span class="ident">Foo</span> {
2-
<span class="ident">i</span>: <span class="ident">i8</span>,
3-
<span class="ident">u</span>: <span class="ident">i8</span>,
1+
<span class="kw">union </span>Foo {
2+
i: i8,
3+
u: i8,
44
}
55

6-
<span class="kw">fn</span> <span class="ident">main</span>() {
7-
<span class="kw">let</span> <span class="ident">union</span> = <span class="number">0</span>;
6+
<span class="kw">fn </span>main() {
7+
<span class="kw">let </span>union = <span class="number">0</span>;
88
}

Diff for: ‎src/test/rustdoc/issue-41783.codeblock.html

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<code># single
2+
## double
3+
### triple
4+
<span class="attribute">#[outer]</span>
5+
<span class="attribute">#![inner]</span></code>

Diff for: ‎src/test/rustdoc/issue-41783.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
// @has issue_41783/struct.Foo.html
22
// @!hasraw - 'space'
33
// @!hasraw - 'comment'
4-
// @hasraw - '# <span class="ident">single'
5-
// @hasraw - '## <span class="ident">double</span>'
6-
// @hasraw - '### <span class="ident">triple</span>'
7-
// @hasraw - '<span class="attribute">#[<span class="ident">outer</span>]</span>'
8-
// @hasraw - '<span class="attribute">#![<span class="ident">inner</span>]</span>'
4+
// @hasraw - '<span class="attribute">#[outer]</span>'
5+
// @hasraw - '<span class="attribute">#![inner]</span>'
6+
// @snapshot 'codeblock' - '//*[@class="rustdoc-toggle top-doc"]/*[@class="docblock"]//pre/code'
97

108
/// ```no_run
119
/// # # space

Diff for: ‎src/test/rustdoc/macro_rules-matchers.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@
55

66
// @has 'foo/macro.todo.html'
77
// @has - '//span[@class="macro"]' 'macro_rules!'
8-
// @has - '//span[@class="ident"]' 'todo'
8+
// @hasraw - ' todo {'
99

1010
// @hasraw - '{ () =&gt; { ... }; ($('
1111
// @has - '//span[@class="macro-nonterminal"]' '$'
1212
// @has - '//span[@class="macro-nonterminal"]' 'arg'
13-
// @hasraw - ':'
14-
// @has - '//span[@class="ident"]' 'tt'
15-
// @hasraw - ')+'
13+
// @hasraw - ':tt)+'
1614
// @hasraw - ') =&gt; { ... }; }'
1715
pub use std::todo;
1816

0 commit comments

Comments
 (0)