Skip to content

Commit d605a9d

Browse files
estebankestebank
committed
Small tweaks to required bound span
1 parent bd7ea54 commit d605a9d

167 files changed

Lines changed: 330 additions & 325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/librustc_trait_selection/traits/error_reporting/mod.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,9 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
13871387
(self.tcx.sess.source_map().span_to_snippet(span), &obligation.cause.code)
13881388
{
13891389
let generics = self.tcx.generics_of(*def_id);
1390-
if generics.params.iter().filter(|p| p.name.as_str() != "Self").next().is_some() && !snippet.ends_with('>') {
1390+
if generics.params.iter().filter(|p| p.name.as_str() != "Self").next().is_some()
1391+
&& !snippet.ends_with('>')
1392+
{
13911393
// FIXME: To avoid spurious suggestions in functions where type arguments
13921394
// where already supplied, we check the snippet to make sure it doesn't
13931395
// end with a turbofish. Ideally we would have access to a `PathSegment`
@@ -1405,7 +1407,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
14051407
// | `Tt::const_val::<[i8; 123]>::<T>`
14061408
// ...
14071409
// LL | const fn const_val<T: Sized>() -> usize {
1408-
// | --------- - required by this bound in `Tt::const_val`
1410+
// | - required by this bound in `Tt::const_val`
14091411
// |
14101412
// = note: cannot satisfy `_: Tt`
14111413

‎src/librustc_trait_selection/traits/error_reporting/suggestions.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
948948
/// --> $DIR/issue-64130-2-send.rs:21:5
949949
/// |
950950
/// LL | fn is_send<T: Send>(t: T) { }
951-
/// | ------- ---- required by this bound in `is_send`
951+
/// | ---- required by this bound in `is_send`
952952
/// ...
953953
/// LL | is_send(bar());
954954
/// | ^^^^^^^ future returned by `bar` is not send
@@ -1356,7 +1356,13 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
13561356
let item_name = tcx.def_path_str(item_def_id);
13571357
let msg = format!("required by this bound in `{}`", item_name);
13581358
if let Some(ident) = tcx.opt_item_name(item_def_id) {
1359-
if !ident.span.overlaps(span) {
1359+
let sm = self.tcx.sess.source_map();
1360+
let same_line =
1361+
match (sm.lookup_line(ident.span.hi()), sm.lookup_line(span.lo())) {
1362+
(Ok(l), Ok(r)) => l.line == r.line,
1363+
_ => true,
1364+
};
1365+
if !ident.span.overlaps(span) && !same_line {
13601366
err.span_label(ident.span, "");
13611367
}
13621368
}

‎src/test/ui/anonymous-higher-ranked-lifetime.stderr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | f1(|_: (), _: ()| {});
77
| expected signature of `for<'r, 's> fn(&'r (), &'s ()) -> _`
88
...
99
LL | fn f1<F>(_: F) where F: Fn(&(), &()) {}
10-
| -- ------------ required by this bound in `f1`
10+
| ------------ required by this bound in `f1`
1111

1212
error[E0631]: type mismatch in closure arguments
1313
--> $DIR/anonymous-higher-ranked-lifetime.rs:3:5
@@ -18,7 +18,7 @@ LL | f2(|_: (), _: ()| {});
1818
| expected signature of `for<'a, 'r> fn(&'a (), &'r ()) -> _`
1919
...
2020
LL | fn f2<F>(_: F) where F: for<'a> Fn(&'a (), &()) {}
21-
| -- ----------------------- required by this bound in `f2`
21+
| ----------------------- required by this bound in `f2`
2222

2323
error[E0631]: type mismatch in closure arguments
2424
--> $DIR/anonymous-higher-ranked-lifetime.rs:4:5
@@ -29,7 +29,7 @@ LL | f3(|_: (), _: ()| {});
2929
| expected signature of `for<'r> fn(&(), &'r ()) -> _`
3030
...
3131
LL | fn f3<'a, F>(_: F) where F: Fn(&'a (), &()) {}
32-
| -- --------------- required by this bound in `f3`
32+
| --------------- required by this bound in `f3`
3333

3434
error[E0631]: type mismatch in closure arguments
3535
--> $DIR/anonymous-higher-ranked-lifetime.rs:5:5
@@ -40,7 +40,7 @@ LL | f4(|_: (), _: ()| {});
4040
| expected signature of `for<'s, 'r> fn(&'s (), &'r ()) -> _`
4141
...
4242
LL | fn f4<F>(_: F) where F: for<'r> Fn(&(), &'r ()) {}
43-
| -- ----------------------- required by this bound in `f4`
43+
| ----------------------- required by this bound in `f4`
4444

4545
error[E0631]: type mismatch in closure arguments
4646
--> $DIR/anonymous-higher-ranked-lifetime.rs:6:5
@@ -51,7 +51,7 @@ LL | f5(|_: (), _: ()| {});
5151
| expected signature of `for<'r> fn(&'r (), &'r ()) -> _`
5252
...
5353
LL | fn f5<F>(_: F) where F: for<'r> Fn(&'r (), &'r ()) {}
54-
| -- -------------------------- required by this bound in `f5`
54+
| -------------------------- required by this bound in `f5`
5555

5656
error[E0631]: type mismatch in closure arguments
5757
--> $DIR/anonymous-higher-ranked-lifetime.rs:7:5
@@ -62,7 +62,7 @@ LL | g1(|_: (), _: ()| {});
6262
| expected signature of `for<'r> fn(&'r (), std::boxed::Box<(dyn for<'s> std::ops::Fn(&'s ()) + 'static)>) -> _`
6363
...
6464
LL | fn g1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>) {}
65-
| -- ------------------------- required by this bound in `g1`
65+
| ------------------------- required by this bound in `g1`
6666

6767
error[E0631]: type mismatch in closure arguments
6868
--> $DIR/anonymous-higher-ranked-lifetime.rs:8:5
@@ -73,7 +73,7 @@ LL | g2(|_: (), _: ()| {});
7373
| expected signature of `for<'r> fn(&'r (), for<'s> fn(&'s ())) -> _`
7474
...
7575
LL | fn g2<F>(_: F) where F: Fn(&(), fn(&())) {}
76-
| -- ---------------- required by this bound in `g2`
76+
| ---------------- required by this bound in `g2`
7777

7878
error[E0631]: type mismatch in closure arguments
7979
--> $DIR/anonymous-higher-ranked-lifetime.rs:9:5
@@ -84,7 +84,7 @@ LL | g3(|_: (), _: ()| {});
8484
| expected signature of `for<'s> fn(&'s (), std::boxed::Box<(dyn for<'r> std::ops::Fn(&'r ()) + 'static)>) -> _`
8585
...
8686
LL | fn g3<F>(_: F) where F: for<'s> Fn(&'s (), Box<dyn Fn(&())>) {}
87-
| -- ------------------------------------ required by this bound in `g3`
87+
| ------------------------------------ required by this bound in `g3`
8888

8989
error[E0631]: type mismatch in closure arguments
9090
--> $DIR/anonymous-higher-ranked-lifetime.rs:10:5
@@ -95,7 +95,7 @@ LL | g4(|_: (), _: ()| {});
9595
| expected signature of `for<'s> fn(&'s (), for<'r> fn(&'r ())) -> _`
9696
...
9797
LL | fn g4<F>(_: F) where F: Fn(&(), for<'r> fn(&'r ())) {}
98-
| -- --------------------------- required by this bound in `g4`
98+
| --------------------------- required by this bound in `g4`
9999

100100
error[E0631]: type mismatch in closure arguments
101101
--> $DIR/anonymous-higher-ranked-lifetime.rs:11:5
@@ -106,7 +106,7 @@ LL | h1(|_: (), _: (), _: (), _: ()| {});
106106
| expected signature of `for<'r, 's> fn(&'r (), std::boxed::Box<(dyn for<'t0> std::ops::Fn(&'t0 ()) + 'static)>, &'s (), for<'t0, 't1> fn(&'t0 (), &'t1 ())) -> _`
107107
...
108108
LL | fn h1<F>(_: F) where F: Fn(&(), Box<dyn Fn(&())>, &(), fn(&(), &())) {}
109-
| -- -------------------------------------------- required by this bound in `h1`
109+
| -------------------------------------------- required by this bound in `h1`
110110

111111
error[E0631]: type mismatch in closure arguments
112112
--> $DIR/anonymous-higher-ranked-lifetime.rs:12:5
@@ -117,7 +117,7 @@ LL | h2(|_: (), _: (), _: (), _: ()| {});
117117
| expected signature of `for<'r, 't0> fn(&'r (), std::boxed::Box<(dyn for<'s> std::ops::Fn(&'s ()) + 'static)>, &'t0 (), for<'s, 't1> fn(&'s (), &'t1 ())) -> _`
118118
...
119119
LL | fn h2<F>(_: F) where F: for<'t0> Fn(&(), Box<dyn Fn(&())>, &'t0 (), fn(&(), &())) {}
120-
| -- --------------------------------------------------------- required by this bound in `h2`
120+
| --------------------------------------------------------- required by this bound in `h2`
121121

122122
error: aborting due to 11 previous errors
123123

‎src/test/ui/associated-types/associated-types-binding-to-type-defined-in-supertrait.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0271]: type mismatch resolving `<ModelT as Vehicle>::Color == Blue`
22
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:31:10
33
|
44
LL | fn blue_car<C:Car<Color=Blue>>(c: C) {
5-
| -------- ---------- required by this bound in `blue_car`
5+
| ---------- required by this bound in `blue_car`
66
...
77
LL | fn b() { blue_car(ModelT); }
88
| ^^^^^^^^ expected struct `Blue`, found struct `Black`
@@ -11,7 +11,7 @@ error[E0271]: type mismatch resolving `<ModelU as Vehicle>::Color == Black`
1111
--> $DIR/associated-types-binding-to-type-defined-in-supertrait.rs:32:10
1212
|
1313
LL | fn black_car<C:Car<Color=Black>>(c: C) {
14-
| --------- ----------- required by this bound in `black_car`
14+
| ----------- required by this bound in `black_car`
1515
...
1616
LL | fn c() { black_car(ModelU); }
1717
| ^^^^^^^^^ expected struct `Black`, found struct `Blue`

‎src/test/ui/associated-types/associated-types-eq-3.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ error[E0271]: type mismatch resolving `<isize as Foo>::A == Bar`
1515
--> $DIR/associated-types-eq-3.rs:38:5
1616
|
1717
LL | fn foo1<I: Foo<A=Bar>>(x: I) {
18-
| ---- ----- required by this bound in `foo1`
18+
| ----- required by this bound in `foo1`
1919
...
2020
LL | foo1(a);
2121
| ^^^^ expected struct `Bar`, found `usize`

‎src/test/ui/associated-types/associated-types-issue-20346.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0271]: type mismatch resolving `<Adapter<I> as Iterator>::Item == std::op
22
--> $DIR/associated-types-issue-20346.rs:34:5
33
|
44
LL | fn is_iterator_of<A, I: Iterator<Item=A>>(_: &I) {}
5-
| -------------- ------ required by this bound in `is_iterator_of`
5+
| ------ required by this bound in `is_iterator_of`
66
...
77
LL | fn test_adapter<T, I: Iterator<Item=Option<T>>>(it: I) {
88
| - this type parameter

‎src/test/ui/associated-types/associated-types-multiple-types-one-trait.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | want_y(t);
55
| ^^^^^^ expected `i32`, found associated type
66
...
77
LL | fn want_y<T:Foo<Y=i32>>(t: &T) { }
8-
| ------ ----- required by this bound in `want_y`
8+
| ----- required by this bound in `want_y`
99
|
1010
= note: expected type `i32`
1111
found associated type `<T as Foo>::Y`
@@ -19,7 +19,7 @@ LL | want_x(t);
1919
| ^^^^^^ expected `u32`, found associated type
2020
...
2121
LL | fn want_x<T:Foo<X=u32>>(t: &T) { }
22-
| ------ ----- required by this bound in `want_x`
22+
| ----- required by this bound in `want_x`
2323
|
2424
= note: expected type `u32`
2525
found associated type `<T as Foo>::X`

‎src/test/ui/associated-types/associated-types-overridden-binding.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0284]: type annotations needed
22
--> $DIR/associated-types-overridden-binding.rs:4:12
33
|
44
LL | trait Foo: Iterator<Item = i32> {}
5-
| --- ---------- required by this bound in `Foo`
5+
| ---------- required by this bound in `Foo`
66
LL | trait Bar: Foo<Item = u32> {}
77
| ^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
88
|
@@ -12,7 +12,7 @@ error[E0284]: type annotations needed
1212
--> $DIR/associated-types-overridden-binding.rs:7:21
1313
|
1414
LL | trait I32Iterator = Iterator<Item = i32>;
15-
| ----------- ---------- required by this bound in `I32Iterator`
15+
| ---------- required by this bound in `I32Iterator`
1616
LL | trait U32Iterator = I32Iterator<Item = u32>;
1717
| ^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
1818
|

‎src/test/ui/associated-types/associated-types-path-2.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ error[E0277]: the trait bound `u32: Foo` is not satisfied
1313
--> $DIR/associated-types-path-2.rs:29:5
1414
|
1515
LL | pub fn f1<T: Foo>(a: T, x: T::A) {}
16-
| -- --- required by this bound in `f1`
16+
| --- required by this bound in `f1`
1717
...
1818
LL | f1(2u32, 4u32);
1919
| ^^ the trait `Foo` is not implemented for `u32`
@@ -28,7 +28,7 @@ error[E0277]: the trait bound `u32: Foo` is not satisfied
2828
--> $DIR/associated-types-path-2.rs:35:5
2929
|
3030
LL | pub fn f1<T: Foo>(a: T, x: T::A) {}
31-
| -- --- required by this bound in `f1`
31+
| --- required by this bound in `f1`
3232
...
3333
LL | f1(2u32, 4i32);
3434
| ^^ the trait `Foo` is not implemented for `u32`

‎src/test/ui/async-await/async-fn-nonsend.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: future cannot be sent between threads safely
22
--> $DIR/async-fn-nonsend.rs:49:5
33
|
44
LL | fn assert_send(_: impl Send) {}
5-
| ----------- ---- required by this bound in `assert_send`
5+
| ---- required by this bound in `assert_send`
66
...
77
LL | assert_send(local_dropped_before_await());
88
| ^^^^^^^^^^^ future returned by `local_dropped_before_await` is not `Send`
@@ -23,7 +23,7 @@ error: future cannot be sent between threads safely
2323
--> $DIR/async-fn-nonsend.rs:51:5
2424
|
2525
LL | fn assert_send(_: impl Send) {}
26-
| ----------- ---- required by this bound in `assert_send`
26+
| ---- required by this bound in `assert_send`
2727
...
2828
LL | assert_send(non_send_temporary_in_match());
2929
| ^^^^^^^^^^^ future returned by `non_send_temporary_in_match` is not `Send`
@@ -44,7 +44,7 @@ error: future cannot be sent between threads safely
4444
--> $DIR/async-fn-nonsend.rs:53:5
4545
|
4646
LL | fn assert_send(_: impl Send) {}
47-
| ----------- ---- required by this bound in `assert_send`
47+
| ---- required by this bound in `assert_send`
4848
...
4949
LL | assert_send(non_sync_with_method_call());
5050
| ^^^^^^^^^^^ future returned by `non_sync_with_method_call` is not `Send`

0 commit comments

Comments
 (0)