diff options
| -rw-r--r-- | compiler/rustc_error_messages/locales/en-US/middle.ftl | 2 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/error.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/traits/query.rs | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/compiler/rustc_error_messages/locales/en-US/middle.ftl b/compiler/rustc_error_messages/locales/en-US/middle.ftl index 3a55064c707..ed834886453 100644 --- a/compiler/rustc_error_messages/locales/en-US/middle.ftl +++ b/compiler/rustc_error_messages/locales/en-US/middle.ftl @@ -1,6 +1,6 @@ middle_drop_check_overflow = overflow while adding drop-check rules for {$ty} - .note = {$note} + .note = overflowed on {$overflow_ty} middle_opaque_hidden_type_mismatch = concrete type differs from previous defining opaque type use diff --git a/compiler/rustc_middle/src/error.rs b/compiler/rustc_middle/src/error.rs index 0dfe6374cf3..18b31a75bcc 100644 --- a/compiler/rustc_middle/src/error.rs +++ b/compiler/rustc_middle/src/error.rs @@ -10,7 +10,7 @@ pub struct DropCheckOverflow<'tcx> { #[primary_span] pub span: Span, pub ty: Ty<'tcx>, - pub note: String, + pub overflow_ty: Ty<'tcx>, } #[derive(SessionDiagnostic)] diff --git a/compiler/rustc_middle/src/traits/query.rs b/compiler/rustc_middle/src/traits/query.rs index 8002f928613..0e6cacb9fd0 100644 --- a/compiler/rustc_middle/src/traits/query.rs +++ b/compiler/rustc_middle/src/traits/query.rs @@ -117,8 +117,7 @@ pub struct DropckOutlivesResult<'tcx> { impl<'tcx> DropckOutlivesResult<'tcx> { pub fn report_overflows(&self, tcx: TyCtxt<'tcx>, span: Span, ty: Ty<'tcx>) { if let Some(overflow_ty) = self.overflows.get(0) { - let note = format!("overflowed on {}", overflow_ty); - tcx.sess.emit_err(DropCheckOverflow { span, ty, note }); + tcx.sess.emit_err(DropCheckOverflow { span, ty, overflow_ty: *overflow_ty }); } } |