Skip to content

Commit f706461

Browse files
committed
Auto merge of #147745 - matthiaskrgr:rollup-b4kftk9, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang/rust#143191 (Stabilize `rwlock_downgrade` library feature) - rust-lang/rust#147444 (Allow printing a fully-qualified path in `def_path_str`) - rust-lang/rust#147527 (Update t-compiler beta nomination Zulip msg) - rust-lang/rust#147670 (some `ErrorGuaranteed` cleanups) - rust-lang/rust#147676 (Return spans out of `is_doc_comment` to reduce reliance on `.span()` on attributes) - rust-lang/rust#147708 (const `mem::drop`) - rust-lang/rust#147710 (Fix ICE when using contracts on async functions) - rust-lang/rust#147716 (Fix some comments) - rust-lang/rust#147718 (miri: use allocator_shim_contents codegen helper) - rust-lang/rust#147729 (ignore boring locals when explaining why a borrow contains a point due to drop of a live local under polonius) - rust-lang/rust#147742 (Revert unintentional whitespace changes to rustfmt-excluded file) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 41f1677 + f94350d commit f706461

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

clippy_lints/src/four_forward_slashes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ impl<'tcx> LateLintPass<'tcx> for FourForwardSlashes {
4747
.tcx
4848
.hir_attrs(item.hir_id())
4949
.iter()
50-
.filter(|i| i.is_doc_comment())
50+
.filter(|i| i.is_doc_comment().is_some())
5151
.fold(item.span.shrink_to_lo(), |span, attr| span.to(attr.span()));
5252
let (Some(file), _, _, end_line, _) = sm.span_to_location_info(span) else {
5353
return;

clippy_lints/src/undocumented_unsafe_blocks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ fn block_has_safety_comment(cx: &LateContext<'_>, span: Span) -> bool {
475475

476476
fn include_attrs_in_span(cx: &LateContext<'_>, hir_id: HirId, span: Span) -> Span {
477477
span.to(cx.tcx.hir_attrs(hir_id).iter().fold(span, |acc, attr| {
478-
if attr.is_doc_comment() {
478+
if attr.is_doc_comment().is_some() {
479479
return acc;
480480
}
481481
acc.to(attr.span())

0 commit comments

Comments
 (0)