diff options
| author | bors <bors@rust-lang.org> | 2020-04-16 18:02:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-16 18:02:11 +0000 |
| commit | 7f3df5772439eee1c512ed2eb540beef1124d236 (patch) | |
| tree | f98ee8dd5a131d5222e94b1428318569dfcdabd3 /src/librustc_error_codes/error_codes | |
| parent | 7fb5187d0423f4cd0441526571b8cd61927123c9 (diff) | |
| parent | 9d28dfee78b5b9a69ee90ec35d24b6342a8cbdfa (diff) | |
| download | rust-7f3df5772439eee1c512ed2eb540beef1124d236.tar.gz rust-7f3df5772439eee1c512ed2eb540beef1124d236.zip | |
Auto merge of #71201 - Dylan-DPC:rollup-23202uf, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #70566 (Don't bail out before linting in generic contexts.) - #71141 (Provide better compiler output when using `?` on `Option` in fn returning `Result` and vice-versa) - #71149 (remove an impossible branch from check_consts) - #71179 (fix more clippy warnings) - #71191 (Clean up E0520 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0520.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes/E0520.md b/src/librustc_error_codes/error_codes/E0520.md index e8a2b4da080..f9d7e02e5c8 100644 --- a/src/librustc_error_codes/error_codes/E0520.md +++ b/src/librustc_error_codes/error_codes/E0520.md @@ -1,5 +1,7 @@ A non-default implementation was already made on this type so it cannot be -specialized further. Erroneous code example: +specialized further. + +Erroneous code example: ```compile_fail,E0520 #![feature(specialization)] |