diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-09 05:01:38 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-09 05:01:38 +0000 |
| commit | 4d15a7553fe9805a45dc05727d6f830bb6bea0b7 (patch) | |
| tree | d4a58a5b320c15906de57197f6fd766b811a5ee6 | |
| parent | 55b757ee3c0b2898afc8239a1d30853c7c19b689 (diff) | |
| parent | 1bd73835d39cd6d65c950375645f084830766200 (diff) | |
| download | rust-4d15a7553fe9805a45dc05727d6f830bb6bea0b7.tar.gz rust-4d15a7553fe9805a45dc05727d6f830bb6bea0b7.zip | |
Merge from rustc
| -rw-r--r-- | clippy_lints/src/loops/never_loop.rs | 3 | ||||
| -rw-r--r-- | clippy_utils/src/hir_utils.rs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/clippy_lints/src/loops/never_loop.rs b/clippy_lints/src/loops/never_loop.rs index 245a903f998..65d922f03df 100644 --- a/clippy_lints/src/loops/never_loop.rs +++ b/clippy_lints/src/loops/never_loop.rs @@ -255,6 +255,9 @@ fn never_loop_expr<'tcx>( InlineAsmOperand::Const { .. } | InlineAsmOperand::SymFn { .. } | InlineAsmOperand::SymStatic { .. } => { NeverLoopResult::Normal }, + InlineAsmOperand::Label { block } => { + never_loop_block(cx, block, local_labels, main_loop_id) + } })), ExprKind::OffsetOf(_, _) | ExprKind::Yield(_, _) diff --git a/clippy_utils/src/hir_utils.rs b/clippy_utils/src/hir_utils.rs index ef61b303f9c..f7f5f7ca35f 100644 --- a/clippy_utils/src/hir_utils.rs +++ b/clippy_utils/src/hir_utils.rs @@ -833,6 +833,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> { self.hash_body(anon_const.body); }, InlineAsmOperand::SymStatic { path, def_id: _ } => self.hash_qpath(path), + InlineAsmOperand::Label { block } => self.hash_block(block), } } }, |