bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #118288 - compiler-errors:is_some_and, r=lqd,dtolnay

Browse source 
Use `is_{some,ok}_and` more in the compiler

slightly more fluent-reading code
This commit is contained in:
Michael Goulet 2023-11-25 17:23:34 -05:00 • committed by GitHub
commit 8dd8db5073
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_mir_build/src/check_unsafety.rs
View file

@ -552,7 +552,7 @@ impl UnsafeOpKind {
) {
let parent_id = tcx.hir().get_parent_item(hir_id);
let parent_owner = tcx.hir().owner(parent_id);
let should_suggest = parent_owner.fn_sig().map_or(false, |sig| sig.header.is_unsafe());
let should_suggest = parent_owner.fn_sig().is_some_and(|sig| sig.header.is_unsafe());
let unsafe_not_inherited_note = if should_suggest {
suggest_unsafe_block.then(|| {
let body_span = tcx.hir().body(parent_owner.body_id().unwrap()).value.span;