diff options
| author | bors <bors@rust-lang.org> | 2020-05-29 23:43:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-29 23:43:20 +0000 |
| commit | 0e9e4083100aa3ebf09b8f1ace0348cb37475eb9 (patch) | |
| tree | 1bb8b3fa49e034b12057f85edfa1e7ac0f5dda74 /src/test/ui/error-codes | |
| parent | 4bd32c98047a809ba5fd1fac2aa044638e5f2105 (diff) | |
| parent | 37894559abd67dd9544f2d66b0e117573e38119c (diff) | |
Auto merge of #72756 - RalfJung:rollup-tbjmtx2, r=RalfJung
Rollup of 9 pull requests Successful merges: - #67460 (Tweak impl signature mismatch errors involving `RegionKind::ReVar` lifetimes) - #71095 (impl From<[T; N]> for Box<[T]>) - #71500 (Make pointer offset methods/intrinsics const) - #71804 (linker: Support `-static-pie` and `-static -shared`) - #71862 (Implement RFC 2585: unsafe blocks in unsafe fn) - #72103 (borrowck `DefId` -> `LocalDefId`) - #72407 (Various minor improvements to Ipv6Addr::Display) - #72413 (impl Step for char (make Range*<char> iterable)) - #72439 (NVPTX support for new asm!) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0490.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/error-codes/E0490.stderr b/src/test/ui/error-codes/E0490.stderr index 03fce213605..9ba5bc330ea 100644 --- a/src/test/ui/error-codes/E0490.stderr +++ b/src/test/ui/error-codes/E0490.stderr @@ -58,8 +58,8 @@ note: ...so that the expression is assignable | LL | let x: &'a _ = &y; | ^^ - = note: expected `&'a &()` - found `&'a &'b ()` + = note: expected `&'a &()` + found `&'a &'b ()` note: but, the lifetime must be valid for the lifetime `'a` as defined on the function body at 1:6... --> $DIR/E0490.rs:1:6 | |