bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove a string comparison about types

Browse source
This commit is contained in:
Takayuki Maeda 2022-07-09 00:07:52 +09:00
parent fac8fa5672
commit 01893d880f
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
View file

@ -13,7 +13,6 @@ use rustc_hir::{
use rustc_infer::infer::{self, TyCtxtInferExt}; use rustc_infer::infer::{self, TyCtxtInferExt};
use rustc_infer::traits; use rustc_infer::traits;
use rustc_middle::lint::in_external_macro; use rustc_middle::lint::in_external_macro;
use rustc_middle::ty::subst::GenericArgKind;
use rustc_middle::ty::{self, Binder, IsSuggestable, Subst, ToPredicate, Ty}; use rustc_middle::ty::{self, Binder, IsSuggestable, Subst, ToPredicate, Ty};
use rustc_span::symbol::sym; use rustc_span::symbol::sym;
use rustc_span::Span; use rustc_span::Span;
@ -238,25 +237,29 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
); );
} }
} }
} else if found.to_string().starts_with("Option<") } else if let ty::Adt(found_adt, found_substs) = found.kind()
&& expected.to_string() == "Option<&str>" && self.tcx.is_diagnostic_item(sym::Option, found_adt.did())
&& let ty::Adt(expected_adt, expected_substs) = expected.kind()
&& self.tcx.is_diagnostic_item(sym::Option, expected_adt.did())
&& let ty::Ref(_, inner_ty, _) = expected_substs.type_at(0).kind()
&& inner_ty.is_str()
{ {
if let ty::Adt(_def, subst) = found.kind() { let ty = found_substs.type_at(0);
if subst.len() != 0 { let mut peeled = ty;
if let GenericArgKind::Type(ty) = subst[0].unpack() { let mut ref_cnt = 0;
let peeled = ty.peel_refs().to_string(); while let ty::Ref(_, inner, _) = peeled.kind() {
if peeled == "String" { peeled = *inner;
let ref_cnt = ty.to_string().len() - peeled.len(); ref_cnt += 1;
let result = format!(".map(|x| &*{}x)", "*".repeat(ref_cnt)); }
err.span_suggestion_verbose( if let ty::Adt(adt, _) = peeled.kind()
expr.span.shrink_to_hi(), && self.tcx.is_diagnostic_item(sym::String, adt.did())
"try converting the passed type into a `&str`", {
result, err.span_suggestion_verbose(
Applicability::MaybeIncorrect, expr.span.shrink_to_hi(),
); "try converting the passed type into a `&str`",
} format!(".map(|x| &*{}x)", "*".repeat(ref_cnt)),
} Applicability::MaybeIncorrect,
} );
} }
} }
} }