diff options
| author | bors <bors@rust-lang.org> | 2020-12-08 08:11:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-12-08 08:11:41 +0000 |
| commit | f9fccbedbff3eee143949abd45df6f3284d8a028 (patch) | |
| tree | 3e2cec769d3845ab72264c651b65c46e5148c257 | |
| parent | 50bca8af1dd29b8b376ec217c6c1ee16d6b69228 (diff) | |
| parent | bd7f9c6c1c808341bc9091e435aac08591e9a205 (diff) | |
| download | rust-f9fccbedbff3eee143949abd45df6f3284d8a028.tar.gz rust-f9fccbedbff3eee143949abd45df6f3284d8a028.zip | |
Auto merge of #6432 - giraffate:sync-from-rust, r=flip1995
Rustup changelog: none
| -rw-r--r-- | clippy_lints/src/loops.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/utils/hir_utils.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/utils/inspector.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index 400148ab81d..1bd96b2b4c8 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -768,7 +768,7 @@ fn never_loop_expr(expr: &Expr<'_>, main_loop_id: HirId) -> NeverLoopResult { ExprKind::InlineAsm(ref asm) => asm .operands .iter() - .map(|o| match o { + .map(|(o, _)| match o { InlineAsmOperand::In { expr, .. } | InlineAsmOperand::InOut { expr, .. } | InlineAsmOperand::Const { expr } diff --git a/clippy_lints/src/utils/hir_utils.rs b/clippy_lints/src/utils/hir_utils.rs index d847d22275e..d942d4e12b1 100644 --- a/clippy_lints/src/utils/hir_utils.rs +++ b/clippy_lints/src/utils/hir_utils.rs @@ -517,7 +517,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> { } } asm.options.hash(&mut self.s); - for op in asm.operands { + for (op, _op_sp) in asm.operands { match op { InlineAsmOperand::In { reg, expr } => { reg.hash(&mut self.s); diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs index 8f0ef9150d4..323d8745538 100644 --- a/clippy_lints/src/utils/inspector.rs +++ b/clippy_lints/src/utils/inspector.rs @@ -293,7 +293,7 @@ fn print_expr(cx: &LateContext<'_>, expr: &hir::Expr<'_>, indent: usize) { println!("{}template: {}", ind, InlineAsmTemplatePiece::to_string(asm.template)); println!("{}options: {:?}", ind, asm.options); println!("{}operands:", ind); - for op in asm.operands { + for (op, _op_sp) in asm.operands { match op { hir::InlineAsmOperand::In { expr, .. } | hir::InlineAsmOperand::InOut { expr, .. } |
