From 59a435b22007d9d9c6d4023b4722e58bf99c3f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Sun, 22 Jul 2018 12:19:34 -0700 Subject: [PATCH] Use MultiSpan in E0707 and E709 --- src/librustc/hir/lowering.rs | 6 +++--- src/test/ui/async-fn-multiple-lifetimes.stderr | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 99db718bdf8..3d5efd23d1b 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -72,7 +72,7 @@ use syntax::tokenstream::{Delimited, TokenStream, TokenTree}; use syntax::parse::token::Token; use syntax::util::small_vector::SmallVector; use syntax::visit::{self, Visitor}; -use syntax_pos::Span; +use syntax_pos::{Span, MultiSpan}; const HIR_ID_COUNTER_LOCKED: u32 = 0xFFFFFFFF; @@ -2049,7 +2049,7 @@ impl<'a> LoweringContext<'a> { if current_lt_name != name { struct_span_err!( self.context.sess, - current_lt_span.between(lifetime.span), + MultiSpan::from_spans(vec![current_lt_span, lifetime.span]), E0709, "multiple different lifetimes used in arguments of `async fn`", ) @@ -2061,7 +2061,7 @@ impl<'a> LoweringContext<'a> { } else if current_lt_name.is_elided() && name.is_elided() { struct_span_err!( self.context.sess, - current_lt_span.between(lifetime.span), + MultiSpan::from_spans(vec![current_lt_span, lifetime.span]), E0707, "multiple elided lifetimes used in arguments of `async fn`", ) diff --git a/src/test/ui/async-fn-multiple-lifetimes.stderr b/src/test/ui/async-fn-multiple-lifetimes.stderr index f203d9acf87..1d34673a005 100644 --- a/src/test/ui/async-fn-multiple-lifetimes.stderr +++ b/src/test/ui/async-fn-multiple-lifetimes.stderr @@ -1,8 +1,8 @@ error[E0709]: multiple different lifetimes used in arguments of `async fn` - --> $DIR/async-fn-multiple-lifetimes.rs:17:49 + --> $DIR/async-fn-multiple-lifetimes.rs:17:47 | LL | async fn multiple_named_lifetimes<'a, 'b>(_: &'a u8, _: &'b u8) {} - | --^^^^^^^^^-- different lifetime here + | ^^ ^^ different lifetime here | | | first lifetime here | @@ -12,7 +12,7 @@ error[E0707]: multiple elided lifetimes used in arguments of `async fn` --> $DIR/async-fn-multiple-lifetimes.rs:26:39 | LL | async fn multiple_elided_lifetimes(_: &u8, _: &u8) {} - | -^^^^^^^- different lifetime here + | ^ ^ different lifetime here | | | first lifetime here |