Skip to content

Commit 1129e86

Browse files
Cleanup render_stability_since_raw to remove code duplication
1 parent 65767e5 commit 1129e86

File tree

1 file changed

+17
-26
lines changed
  • src/librustdoc/html/render

1 file changed

+17
-26
lines changed

src/librustdoc/html/render/mod.rs

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,34 +2934,25 @@ fn render_stability_since_raw(
29342934
containing_ver: Option<&str>,
29352935
containing_const_ver: Option<&str>,
29362936
) {
2937-
let ver = ver.and_then(|inner| if !inner.is_empty() { Some(inner) } else { None });
2937+
let ver = ver.filter(|inner| !inner.is_empty());
2938+
let const_ver = const_ver.filter(|inner| !inner.is_empty());
29382939

2939-
let const_ver = const_ver.and_then(|inner| if !inner.is_empty() { Some(inner) } else { None });
2940-
2941-
if let Some(v) = ver {
2942-
if let Some(cv) = const_ver {
2943-
if const_ver != containing_const_ver {
2944-
write!(
2945-
w,
2946-
"<span class=\"since\" title=\"Stable since Rust version {0}, const since {1}\">{0} (const: {1})</span>",
2947-
v, cv
2948-
);
2949-
} else if ver != containing_ver {
2950-
write!(
2951-
w,
2952-
"<span class=\"since\" title=\"Stable since Rust version {0}\">{0}</span>",
2953-
v
2954-
);
2955-
}
2956-
} else {
2957-
if ver != containing_ver {
2958-
write!(
2959-
w,
2960-
"<span class=\"since\" title=\"Stable since Rust version {0}\">{0}</span>",
2961-
v
2962-
);
2963-
}
2940+
match (ver, const_ver) {
2941+
(Some(v), Some(cv)) if const_ver != containing_const_ver => {
2942+
write!(
2943+
w,
2944+
"<span class=\"since\" title=\"Stable since Rust version {0}, const since {1}\">{0} (const: {1})</span>",
2945+
v, cv
2946+
);
2947+
}
2948+
(Some(v), _) if ver != containing_ver => {
2949+
write!(
2950+
w,
2951+
"<span class=\"since\" title=\"Stable since Rust version {0}\">{0}</span>",
2952+
v
2953+
);
29642954
}
2955+
_ => {}
29652956
}
29662957
}
29672958

0 commit comments

Comments
 (0)