mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NonZero suggestions.

Browse Source
This commit is contained in:
Markus Reiter 2024-01-20 18:47:22 +01:00
parent ca2ec7af35
commit 117eb9f376
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
View File

@ -2140,46 +2140,50 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
expr_ty: Ty<'tcx>, expr_ty: Ty<'tcx>,
) -> bool { ) -> bool {
let tcx = self.tcx; let tcx = self.tcx;
let (adt, unwrap) = match expected.kind() { let (adt, substs, unwrap) = match expected.kind() {
// In case Option<NonZero*> is wanted, but * is provided, suggest calling new // In case Option<NonZero*> is wanted, but * is provided, suggest calling new
ty::Adt(adt, args) if tcx.is_diagnostic_item(sym::Option, adt.did()) => { ty::Adt(adt, substs) if tcx.is_diagnostic_item(sym::Option, adt.did()) => {
// Unwrap option let nonzero_type = substs.type_at(0); // Unwrap option type.
let ty::Adt(adt, _) = args.type_at(0).kind() else { let ty::Adt(adt, substs) = nonzero_type.kind() else {
return false; return false;
}; };
(adt, substs, "")
(adt, "")
} }
// In case NonZero* is wanted, but * is provided also add `.unwrap()` to satisfy types // In case `NonZero<*>` is wanted but `*` is provided, also add `.unwrap()` to satisfy types.
ty::Adt(adt, _) => (adt, ".unwrap()"), ty::Adt(adt, substs) => (adt, substs, ".unwrap()"),
_ => return false, _ => return false,
}; };
let map = [ if !self.tcx.is_diagnostic_item(sym::NonZero, adt.did()) {
(sym::NonZeroU8, tcx.types.u8), return false;
(sym::NonZeroU16, tcx.types.u16), }
(sym::NonZeroU32, tcx.types.u32),
(sym::NonZeroU64, tcx.types.u64), // FIXME: This can be simplified once `NonZero<T>` is stable.
(sym::NonZeroU128, tcx.types.u128), let coercable_types = [
(sym::NonZeroI8, tcx.types.i8), ("NonZeroU8", tcx.types.u8),
(sym::NonZeroI16, tcx.types.i16), ("NonZeroU16", tcx.types.u16),
(sym::NonZeroI32, tcx.types.i32), ("NonZeroU32", tcx.types.u32),
(sym::NonZeroI64, tcx.types.i64), ("NonZeroU64", tcx.types.u64),
(sym::NonZeroI128, tcx.types.i128), ("NonZeroU128", tcx.types.u128),
("NonZeroI8", tcx.types.i8),
("NonZeroI16", tcx.types.i16),
("NonZeroI32", tcx.types.i32),
("NonZeroI64", tcx.types.i64),
("NonZeroI128", tcx.types.i128),
]; ];
let Some((s, _)) = map.iter().find(|&&(s, t)| { let int_type = substs.type_at(0);
self.tcx.is_diagnostic_item(s, adt.did()) && self.can_coerce(expr_ty, t)
let Some(nonzero_alias) = coercable_types.iter().find_map(|(nonzero_alias, t)| {
if *t == int_type && self.can_coerce(expr_ty, *t) { Some(nonzero_alias) } else { None }
}) else { }) else {
return false; return false;
}; };
let path = self.tcx.def_path_str(adt.non_enum_variant().def_id);
err.multipart_suggestion( err.multipart_suggestion(
format!("consider calling `{s}::new`"), format!("consider calling `{nonzero_alias}::new`"),
vec![ vec![
(expr.span.shrink_to_lo(), format!("{path}::new(")), (expr.span.shrink_to_lo(), format!("{nonzero_alias}::new(")),
(expr.span.shrink_to_hi(), format!("){unwrap}")), (expr.span.shrink_to_hi(), format!("){unwrap}")),
], ],
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,