rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #72014 - GuillaumeGomez:deprecated-emoji, r=kinnison,ollie27

Browse Source 
Deprecated emoji

Fixes #67872.

r? @kinnison

cc @rust-lang/rustdoc
This commit is contained in:
Dylan DPC
2020-05-11 22:20:51 +02:00
committed by GitHub
parent 99cb9ccb9c 9d8310856b
commit dd595fade5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustdoc/html/render.rs
View File

@@ -2281,7 +2281,10 @@ fn short_stability(item: &clean::Item, cx: &Context) -> Vec<String> {
); );
message.push_str(&format!(": {}", html.to_string())); message.push_str(&format!(": {}", html.to_string()));
} }
stability.push(format!("<div class='stab deprecated'>{}</div>", message)); stability.push(format!(
"<div class='stab deprecated'><span class='emoji'>👎</span> {}</div>",
message,
));
} }
if let Some(stab) = item.stability.as_ref().filter(|stab| stab.level == stability::Unstable) { if let Some(stab) = item.stability.as_ref().filter(|stab| stab.level == stability::Unstable) {

4
src/test/rustdoc/issue-32374.rs
View File

@@ -10,7 +10,7 @@
// @matches issue_32374/index.html '//*[@class="docblock-short"]/text()' 'Docs' // @matches issue_32374/index.html '//*[@class="docblock-short"]/text()' 'Docs'
// @has issue_32374/struct.T.html '//*[@class="stab deprecated"]' \ // @has issue_32374/struct.T.html '//*[@class="stab deprecated"]' \
// 'Deprecated since 1.0.0: text' // '👎 Deprecated since 1.0.0: text'
// @has - '<code>test</code>&nbsp;<a href="http://issue_url/32374">#32374</a>' // @has - '<code>test</code>&nbsp;<a href="http://issue_url/32374">#32374</a>'
// @matches issue_32374/struct.T.html '//*[@class="stab unstable"]' \ // @matches issue_32374/struct.T.html '//*[@class="stab unstable"]' \
// '🔬 This is a nightly-only experimental API. \(test\s#32374\)$' // '🔬 This is a nightly-only experimental API. \(test\s#32374\)$'
@@ -20,7 +20,7 @@
pub struct T; pub struct T;
// @has issue_32374/struct.U.html '//*[@class="stab deprecated"]' \ // @has issue_32374/struct.U.html '//*[@class="stab deprecated"]' \
// 'Deprecated since 1.0.0: deprecated' // '👎 Deprecated since 1.0.0: deprecated'
// @has issue_32374/struct.U.html '//*[@class="stab unstable"]' \ // @has issue_32374/struct.U.html '//*[@class="stab unstable"]' \
// '🔬 This is a nightly-only experimental API. (test #32374)' // '🔬 This is a nightly-only experimental API. (test #32374)'
// @has issue_32374/struct.U.html '//details' \ // @has issue_32374/struct.U.html '//details' \