Skip to content

Commit 961fe79

Browse files
Stop considering _ as a keyword
1 parent b21b01a commit 961fe79

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/librustdoc/html/highlight.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,11 @@ impl<'a> Iterator for TokenIter<'a> {
785785

786786
/// Classifies into identifier class; returns `None` if this is a non-keyword identifier.
787787
fn get_real_ident_class(text: &str, allow_path_keywords: bool) -> Option<Class> {
788-
let ignore: &[&str] =
789-
if allow_path_keywords { &["self", "Self", "super", "crate"] } else { &["self", "Self"] };
788+
let ignore: &[&str] = if allow_path_keywords {
789+
&["self", "Self", "super", "crate", "_"]
790+
} else {
791+
&["self", "Self", "_"]
792+
};
790793
if ignore.contains(&text) {
791794
return None;
792795
}

src/librustdoc/html/highlight/fixtures/sample.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#[cfg(target_os = <span class="string">"windows"</span>)]
1717
</span><span class="kw">fn </span>main() -&gt; () {
1818
<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>;
19-
<span class="kw">let _</span>: <span class="kw-2">*const </span>() = <span class="number">0</span>;
20-
<span class="kw">let _ </span>= <span class="kw-2">&amp;</span>foo;
21-
<span class="kw">let _ </span>= &amp;&amp;foo;
22-
<span class="kw">let _ </span>= <span class="kw-2">*</span>foo;
19+
<span class="kw">let </span>_: <span class="kw-2">*const </span>() = <span class="number">0</span>;
20+
<span class="kw">let </span>_ = <span class="kw-2">&amp;</span>foo;
21+
<span class="kw">let </span>_ = &amp;&amp;foo;
22+
<span class="kw">let </span>_ = <span class="kw-2">*</span>foo;
2323
<span class="macro">mac!</span>(foo, <span class="kw-2">&amp;mut </span>bar);
2424
<span class="macro">assert!</span>(<span class="self">self</span>.length &lt; N &amp;&amp; index &lt;= <span class="self">self</span>.length);
2525
::std::env::var(<span class="string">"gateau"</span>).is_ok();

0 commit comments

Comments
 (0)