Auto merge of #11646 - Nilstrieb:compiler-does-not-comply-with-the-lints!!, r=giraffate
Make `multiple_unsafe_ops_per_block` ignore await desugaring The await desugaring contains two calls (`Poll::new_unchecked` and `get_context`) inside a single unsafe block. That violates the lint. fixes #11312 changelog: [`multiple_unsafe_ops_per_block`]: fix false positives in `.await`
This commit is contained in:
commit
2cf708d04f
@ -9,7 +9,7 @@
|
|||||||
use rustc_middle::lint::in_external_macro;
|
use rustc_middle::lint::in_external_macro;
|
||||||
use rustc_middle::ty;
|
use rustc_middle::ty;
|
||||||
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
||||||
use rustc_span::Span;
|
use rustc_span::{DesugaringKind, Span};
|
||||||
|
|
||||||
declare_clippy_lint! {
|
declare_clippy_lint! {
|
||||||
/// ### What it does
|
/// ### What it does
|
||||||
@ -64,7 +64,10 @@
|
|||||||
|
|
||||||
impl<'tcx> LateLintPass<'tcx> for MultipleUnsafeOpsPerBlock {
|
impl<'tcx> LateLintPass<'tcx> for MultipleUnsafeOpsPerBlock {
|
||||||
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &'tcx hir::Block<'_>) {
|
fn check_block(&mut self, cx: &LateContext<'tcx>, block: &'tcx hir::Block<'_>) {
|
||||||
if !matches!(block.rules, BlockCheckMode::UnsafeBlock(_)) || in_external_macro(cx.tcx.sess, block.span) {
|
if !matches!(block.rules, BlockCheckMode::UnsafeBlock(_))
|
||||||
|
|| in_external_macro(cx.tcx.sess, block.span)
|
||||||
|
|| block.span.is_desugaring(DesugaringKind::Await)
|
||||||
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let mut unsafe_ops = vec![];
|
let mut unsafe_ops = vec![];
|
||||||
|
@ -147,4 +147,11 @@ fn _field_fn_ptr(x: unsafe fn()) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// await expands to an unsafe block with several operations, but this is fine.: #11312
|
||||||
|
async fn await_desugaring_silent() {
|
||||||
|
async fn helper() {}
|
||||||
|
|
||||||
|
helper().await;
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
Loading…
Reference in New Issue
Block a user