Skip to content

Commit 9702c6a

Browse files
committed
Auto merge of #122182 - matthiaskrgr:rollup-gzimi4c, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #118623 (Improve std::fs::read_to_string example) - #119365 (Add asm goto support to `asm!`) - #120608 (Docs for std::ptr::slice_from_raw_parts) - #121832 (Add new Tier-3 target: `loongarch64-unknown-linux-musl`) - #121938 (Fix quadratic behavior of repeated vectored writes) - #122099 (Add `#[inline]` to `BTreeMap::new` constructor) - #122103 (Make TAITs and ATPITs capture late-bound lifetimes in scope) - #122143 (PassWrapper: update for llvm/llvm-project@a3319371970b) Failed merges: - #122076 (Tweak the way we protect in-place function arguments in interpreters) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4b2bbac + 757ac25 commit 9702c6a

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

clippy_lints/src/loops/never_loop.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ fn never_loop_expr<'tcx>(
255255
InlineAsmOperand::Const { .. } | InlineAsmOperand::SymFn { .. } | InlineAsmOperand::SymStatic { .. } => {
256256
NeverLoopResult::Normal
257257
},
258+
InlineAsmOperand::Label { block } => {
259+
never_loop_block(cx, block, local_labels, main_loop_id)
260+
}
258261
})),
259262
ExprKind::OffsetOf(_, _)
260263
| ExprKind::Yield(_, _)

clippy_utils/src/hir_utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
833833
self.hash_body(anon_const.body);
834834
},
835835
InlineAsmOperand::SymStatic { path, def_id: _ } => self.hash_qpath(path),
836+
InlineAsmOperand::Label { block } => self.hash_block(block),
836837
}
837838
}
838839
},

0 commit comments

Comments
 (0)