Skip to content

Commit

Permalink
Rollup merge of rust-lang#67897 - pickfire:patch-1, r=Dylan-DPC
Browse files Browse the repository at this point in the history
Use `as_deref()` to replace `as_ref().map(...)`

Suggested by @lzutao
  • Loading branch information
Dylan-DPC authored Jan 6, 2020
2 parents 005d9d5 + 3d857ef commit 2e965e9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/librustdoc/html/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2152,7 +2152,7 @@ fn stability_tags(item: &clean::Item) -> String {
}

if let Some(stab) = item.stability.as_ref().filter(|s| s.level == stability::Unstable) {
if stab.feature.as_ref().map(|s| &**s) == Some("rustc_private") {
if stab.feature.as_deref() == Some("rustc_private") {
tags += &tag_html("internal", "Internal");
} else {
tags += &tag_html("unstable", "Experimental");
Expand Down Expand Up @@ -2205,7 +2205,7 @@ fn short_stability(item: &clean::Item, cx: &Context) -> Vec<String> {
}

if let Some(stab) = item.stability.as_ref().filter(|stab| stab.level == stability::Unstable) {
let is_rustc_private = stab.feature.as_ref().map(|s| &**s) == Some("rustc_private");
let is_rustc_private = stab.feature.as_deref() == Some("rustc_private");

let mut message = if is_rustc_private {
"<span class='emoji'>⚙️</span> This is an internal compiler API."
Expand All @@ -2214,7 +2214,7 @@ fn short_stability(item: &clean::Item, cx: &Context) -> Vec<String> {
}
.to_owned();

if let Some(feature) = stab.feature.as_ref() {
if let Some(feature) = stab.feature.as_deref() {
let mut feature = format!("<code>{}</code>", Escape(&feature));
if let (Some(url), Some(issue)) = (&cx.shared.issue_tracker_base_url, stab.issue) {
feature.push_str(&format!(
Expand Down

0 comments on commit 2e965e9

Please sign in to comment.