diff options
| author | bors <bors@rust-lang.org> | 2020-04-24 00:49:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-24 00:49:05 +0000 |
| commit | 45c7838089576552391237bb41cdd3d46582d3e5 (patch) | |
| tree | be8f505326157d0cad29a4ca5c24ad6ce8eafb19 /src/librustc_error_codes/error_codes | |
| parent | 14b15521c52549ebbb113173b4abecd124b5a823 (diff) | |
| parent | 8a0e88e653c0382681c81c999dd91ba88ac16568 (diff) | |
| download | rust-45c7838089576552391237bb41cdd3d46582d3e5.tar.gz rust-45c7838089576552391237bb41cdd3d46582d3e5.zip | |
Auto merge of #71496 - Dylan-DPC:rollup-gwxejmk, r=Dylan-DPC
Rollup of 6 pull requests
Successful merges:
- #70845 (Make the `structural_match` error diagnostic for const generics clearer)
- #71063 (Document unsafety in core::{option, hash})
- #71068 (Stabilize UNICODE_VERSION (feature unicode_version))
- #71426 (fix error code in E0751.md)
- #71459 (Add leading 0x to offset in Debug fmt of Pointer)
- #71492 (Document unsafety in core::{panicking, alloc::layout, hint, iter::adapters::zip})
Failed merges:
r? @ghost
Diffstat (limited to 'src/librustc_error_codes/error_codes')
| -rw-r--r-- | src/librustc_error_codes/error_codes/E0751.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_error_codes/error_codes/E0751.md b/src/librustc_error_codes/error_codes/E0751.md index a440f82e4b6..809b888d92a 100644 --- a/src/librustc_error_codes/error_codes/E0751.md +++ b/src/librustc_error_codes/error_codes/E0751.md @@ -2,7 +2,7 @@ There are both a positive and negative trait implementation for the same type. Erroneous code example: -```compile_fail,E0748 +```compile_fail,E0751 trait MyTrait {} impl MyTrait for i32 { } impl !MyTrait for i32 { } |