diff options
| author | bors <bors@rust-lang.org> | 2019-12-11 05:31:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-11 05:31:28 +0000 |
| commit | ddca1e09c36a6ce21d95fec1619f23ba59b69c8a (patch) | |
| tree | 1d0ebc98f017b59a3a2a5b00ad2ef48cf894bc1e /src/librustc_error_codes | |
| parent | a2333023594826dc5078ce7129fafb85471b7857 (diff) | |
| parent | 398ed7fe2e81ee6afe200c1d3faa22c6a51d8457 (diff) | |
| download | rust-ddca1e09c36a6ce21d95fec1619f23ba59b69c8a.tar.gz rust-ddca1e09c36a6ce21d95fec1619f23ba59b69c8a.zip | |
Auto merge of #67202 - JohnTitor:rollup-0xjm5pz, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #66377 (Update RELEASES.md for 1.40.0) - #67134 (Ensure that we get a hard error on generic ZST constants if their bod…) - #67152 (Sort auto trait and blanket implementations display) - #67154 (Fix typos in src/libcore/alloc.rs docs) - #67168 (corrected comment in E0478) - #67178 (Move non clean impls items) - #67180 (doc: Use .copied() instead of .cloned() in Vec example) - #67181 (Update hashmap doc) - #67193 (In which we start tracking polonius in `-Z self-profile`) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0478.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_error_codes/error_codes/E0478.md b/src/librustc_error_codes/error_codes/E0478.md index 6634d9b6e63..4bc5fde2e89 100644 --- a/src/librustc_error_codes/error_codes/E0478.md +++ b/src/librustc_error_codes/error_codes/E0478.md @@ -21,8 +21,8 @@ this issue, you need to specify it: ``` trait Wedding<'t>: 't { } -struct Prince<'kiss, 'SnowWhite: 'kiss> { // You say here that 'kiss must live - // longer than 'SnowWhite. +struct Prince<'kiss, 'SnowWhite: 'kiss> { // You say here that 'SnowWhite + // must live longer than 'kiss. child: Box<Wedding<'kiss> + 'SnowWhite>, // And now it's all good! } ``` |