diff options
| author | bors <bors@rust-lang.org> | 2018-06-30 16:52:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-30 16:52:12 +0000 |
| commit | 8772747c5f3a5809aea9abdb1586613b751db9ac (patch) | |
| tree | 830525cc6ddda31909db27b7aa5072d78004f7a7 /src/test/ui/error-codes | |
| parent | 96b47337d9deebdb9cbca909e7772672062021e5 (diff) | |
| parent | 8449c5ab8a83cfa1f89c8f7810a42a54130c844d (diff) | |
Auto merge of #51862 - estebank:lifetime-spans, r=nikomatsakis
Point to lifetime spans on lifetime errors
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0195.stderr | 6 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0478.stderr | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr index f2cf661830d..3860c93a45f 100644 --- a/src/test/ui/error-codes/E0195.stderr +++ b/src/test/ui/error-codes/E0195.stderr @@ -1,11 +1,11 @@ error[E0195]: lifetime parameters or bounds on method `bar` do not match the trait declaration - --> $DIR/E0195.rs:19:5 + --> $DIR/E0195.rs:19:11 | LL | fn bar<'a,'b:'a>(x: &'a str, y: &'b str); - | ----------------------------------------- lifetimes in impl do not match this method in trait + | ---------- lifetimes in impl do not match this method in trait ... LL | fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195 - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetimes do not match method in trait + | ^^^^^^^ lifetimes do not match method in trait error: aborting due to previous error diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr index 44d8151303f..0e778908058 100644 --- a/src/test/ui/error-codes/E0478.stderr +++ b/src/test/ui/error-codes/E0478.stderr @@ -4,16 +4,16 @@ error[E0478]: lifetime bound not satisfied LL | child: Box<Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | -note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 13:1 - --> $DIR/E0478.rs:13:1 +note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 13:22 + --> $DIR/E0478.rs:13:22 | LL | struct Prince<'kiss, 'SnowWhite> { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 13:1 - --> $DIR/E0478.rs:13:1 + | ^^^^^^^^^^ +note: but lifetime parameter must outlive the lifetime 'kiss as defined on the struct at 13:15 + --> $DIR/E0478.rs:13:15 | LL | struct Prince<'kiss, 'SnowWhite> { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | ^^^^^ error: aborting due to previous error |