diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2024-12-15 20:01:38 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-15 20:01:38 +1100 |
| commit | d48af09ffd173fd87136d41033665bcf23ea251c (patch) | |
| tree | 38f8a73101a5e14810c6c6ca843a6b37cc518f53 /src/librustdoc/html/render | |
| parent | 5ce0d812fa68095b92a127afb9c150c503177c0c (diff) | |
| parent | 8a4e5d7444c4d43097c2ca0d1b8e64be9dbeddfa (diff) | |
| download | rust-d48af09ffd173fd87136d41033665bcf23ea251c.tar.gz rust-d48af09ffd173fd87136d41033665bcf23ea251c.zip | |
Rollup merge of #134285 - oli-obk:push-vwrqsqlwnuxo, r=Urgau
Add some convenience helper methods on `hir::Safety` Makes a lot of call sites simpler and should make any refactorings needed for https://github.com/rust-lang/rust/pull/134090#issuecomment-2541332415 simpler, as fewer sites have to be touched in case we end up storing some information in the variants of `hir::Safety`
Diffstat (limited to 'src/librustdoc/html/render')
| -rw-r--r-- | src/librustdoc/html/render/print_item.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/librustdoc/html/render/print_item.rs b/src/librustdoc/html/render/print_item.rs index 4c8d704e65b..ced9ff2d685 100644 --- a/src/librustdoc/html/render/print_item.rs +++ b/src/librustdoc/html/render/print_item.rs @@ -469,7 +469,7 @@ fn item_module(w: &mut Buffer, cx: &Context<'_>, item: &clean::Item, items: &[cl let unsafety_flag = match myitem.kind { clean::FunctionItem(_) | clean::ForeignFunctionItem(..) - if myitem.fn_header(tcx).unwrap().safety == hir::Safety::Unsafe => + if myitem.fn_header(tcx).unwrap().safety.is_unsafe() => { "<sup title=\"unsafe function\">⚠</sup>" } @@ -1926,9 +1926,7 @@ fn item_static( buffer, "{vis}{safe}static {mutability}{name}: {typ}", vis = visibility_print_with_space(it, cx), - safe = safety - .map(|safe| if safe == hir::Safety::Unsafe { "unsafe " } else { "" }) - .unwrap_or(""), + safe = safety.map(|safe| safe.prefix_str()).unwrap_or(""), mutability = s.mutability.print_with_space(), name = it.name.unwrap(), typ = s.type_.print(cx) |