bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make suggestion have a more targetted underline

Browse source
This commit is contained in:
Esteban Küber 2020-08-18 16:15:55 -07:00
parent fd9133b9c3
commit ff297fafbf
4 changed files with 21 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -70,7 +70,7 @@ use rustc_middle::ty::{
subst::{Subst, SubstsRef},
Region, Ty, TyCtxt, TypeFoldable,
};
use rustc_span::{DesugaringKind, Pos, Span};
use rustc_span::{BytePos, DesugaringKind, Pos, Span};
use rustc_target::spec::abi;
use std::{cmp, fmt};
@ -731,16 +731,12 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
return_sp: Span,
arm_spans: impl Iterator<Item = Span>,
) {
let snippet = self
.tcx
.sess
.source_map()
.span_to_snippet(return_sp)
.unwrap_or_else(|_| "dyn Trait".to_string());
err.span_suggestion_verbose(
return_sp,
err.multipart_suggestion(
"you could change the return type to be a boxed trait object",
format!("Box<dyn {}>", &snippet[5..]),
vec![
(return_sp.with_hi(return_sp.lo() + BytePos(4)), "Box<dyn".to_string()),
(return_sp.shrink_to_hi(), ">".to_string()),
],
Applicability::MaybeIncorrect,
);
let sugg = arm_spans

10
compiler/rustc_typeck/src/check/coercion.rs
View file

@ -51,7 +51,7 @@ use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{self, Ty, TypeAndMut};
use rustc_session::parse::feature_err;
use rustc_span::symbol::sym;
use rustc_span::{self, Span};
use rustc_span::{self, BytePos, Span};
use rustc_target::spec::abi::Abi;
use rustc_trait_selection::traits::error_reporting::InferCtxtExt;
use rustc_trait_selection::traits::{self, ObligationCause, ObligationCauseCode};
@ -1523,10 +1523,12 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
};
if has_impl {
if is_object_safe {
err.span_suggestion_verbose(
return_sp,
err.multipart_suggestion(
"you could change the return type to be a boxed trait object",
format!("Box<dyn {}>", &snippet[5..]),
vec![
(return_sp.with_hi(return_sp.lo() + BytePos(4)), "Box<dyn".to_string()),
(return_sp.shrink_to_hi(), ">".to_string()),
],
Applicability::MachineApplicable,
);
} else {