nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from the review

Browse Source 
- Use `expr.hir_id.owner` instead of `self.tcx.parent_module(expr.hir_id)`
- Use `.type_at()` instead of `.first()` + `.expect_ty()`
- Use single `.find()` with `&&` condition

Co-authored-by: Michael Goulet <michael@errs.io>
This commit is contained in:
Maybe Waffle 2022-07-19 02:15:56 +04:00
parent da2752e00f
commit 2edad7d77c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_typeck/src/check/demand.rs
View File

@ -358,10 +358,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let sole_field = &variant.fields[0];
if !sole_field.did.is_local()
&& !sole_field.vis.is_accessible_from(
self.tcx.parent_module(expr.hir_id).to_def_id(),
self.tcx,
)
&& !sole_field
.vis
.is_accessible_from(expr.hir_id.owner.to_def_id(), self.tcx)
{
return None;
}
@ -433,8 +432,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// In case Option<NonZero*> is wanted, but * is provided, suggest calling new
ty::Adt(adt, substs) if tcx.is_diagnostic_item(sym::Option, adt.did()) => {
// Unwrap option
let Some(fst) = substs.first() else { return };
let ty::Adt(adt, _) = fst.expect_ty().kind() else { return };
let ty::Adt(adt, _) = substs.type_at(0).kind() else { return };
(adt, "")
}
@ -458,8 +456,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let Some((s, _)) = map
.iter()
.find(|&&(s, _)| self.tcx.is_diagnostic_item(s, adt.did()))
.filter(|&&(_, t)| { self.can_coerce(expr_ty, t) })
.find(|&&(s, t)| self.tcx.is_diagnostic_item(s, adt.did()) && self.can_coerce(expr_ty, t))
else { return };
let path = self.tcx.def_path_str(adt.non_enum_variant().def_id);