bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't suggest extra <> in dyn suggestion.

Browse source
This commit is contained in:
Mara Bos 2021-08-30 22:34:34 +02:00
parent 13edc17f65
commit 23d2cb8435
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
View file

@ -914,7 +914,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}); });
if result.is_ok() { if result.is_ok() {
self.maybe_lint_bare_trait(qpath, hir_id); self.maybe_lint_bare_trait(qpath, hir_id, span);
self.register_wf_obligation(ty.into(), qself.span, traits::WellFormed(None)); self.register_wf_obligation(ty.into(), qself.span, traits::WellFormed(None));
} }
@ -927,7 +927,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
) )
} }
fn maybe_lint_bare_trait(&self, qpath: &QPath<'_>, hir_id: hir::HirId) { fn maybe_lint_bare_trait(&self, qpath: &QPath<'_>, hir_id: hir::HirId, span: Span) {
if let QPath::TypeRelative(self_ty, _) = qpath { if let QPath::TypeRelative(self_ty, _) = qpath {
if let TyKind::TraitObject([poly_trait_ref, ..], _, TraitObjectSyntax::None) = if let TyKind::TraitObject([poly_trait_ref, ..], _, TraitObjectSyntax::None) =
self_ty.kind self_ty.kind
@ -935,10 +935,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let msg = "trait objects without an explicit `dyn` are deprecated"; let msg = "trait objects without an explicit `dyn` are deprecated";
let (sugg, app) = match self.tcx.sess.source_map().span_to_snippet(self_ty.span) { let (sugg, app) = match self.tcx.sess.source_map().span_to_snippet(self_ty.span) {
Ok(s) if poly_trait_ref.trait_ref.path.is_global() => { Ok(s) if poly_trait_ref.trait_ref.path.is_global() => {
(format!("<dyn ({})>", s), Applicability::MachineApplicable) (format!("dyn ({})", s), Applicability::MachineApplicable)
} }
Ok(s) => (format!("<dyn {}>", s), Applicability::MachineApplicable), Ok(s) => (format!("dyn {}", s), Applicability::MachineApplicable),
Err(_) => ("<dyn <type>>".to_string(), Applicability::HasPlaceholders), Err(_) => ("dyn <type>".to_string(), Applicability::HasPlaceholders),
};
// Wrap in `<..>` if it isn't already.
let sugg = match self.tcx.sess.source_map().span_to_snippet(span) {
Ok(s) if s.starts_with('<') => sugg,
_ => format!("<{}>", sugg),
}; };
let replace = String::from("use `dyn`"); let replace = String::from("use `dyn`");
if self.sess().edition() >= Edition::Edition2021 { if self.sess().edition() >= Edition::Edition2021 {